aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-10-19 00:20:57 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-19 00:20:57 -0400
commit6723ab549df777742801716d7aeea397e6e97f2c (patch)
tree17e69e8f3ec0e0d33a379491eef8e9c6ac3f1530 /net
parent6ba7511b7c8b71d5148f7516584d0b677acc384a (diff)
[IPV6]: Fix route.c warnings when multiple tables are disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/route.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5c00ca4fa52c..c953466b7afd 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -94,9 +94,6 @@ static int ip6_dst_gc(void);
94 94
95static int ip6_pkt_discard(struct sk_buff *skb); 95static int ip6_pkt_discard(struct sk_buff *skb);
96static int ip6_pkt_discard_out(struct sk_buff *skb); 96static int ip6_pkt_discard_out(struct sk_buff *skb);
97static int ip6_pkt_prohibit(struct sk_buff *skb);
98static int ip6_pkt_prohibit_out(struct sk_buff *skb);
99static int ip6_pkt_blk_hole(struct sk_buff *skb);
100static void ip6_link_failure(struct sk_buff *skb); 97static void ip6_link_failure(struct sk_buff *skb);
101static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu); 98static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu);
102 99
@@ -144,6 +141,10 @@ struct rt6_info ip6_null_entry = {
144 141
145#ifdef CONFIG_IPV6_MULTIPLE_TABLES 142#ifdef CONFIG_IPV6_MULTIPLE_TABLES
146 143
144static int ip6_pkt_prohibit(struct sk_buff *skb);
145static int ip6_pkt_prohibit_out(struct sk_buff *skb);
146static int ip6_pkt_blk_hole(struct sk_buff *skb);
147
147struct rt6_info ip6_prohibit_entry = { 148struct rt6_info ip6_prohibit_entry = {
148 .u = { 149 .u = {
149 .dst = { 150 .dst = {
@@ -1768,6 +1769,8 @@ static int ip6_pkt_discard_out(struct sk_buff *skb)
1768 return ip6_pkt_discard(skb); 1769 return ip6_pkt_discard(skb);
1769} 1770}
1770 1771
1772#ifdef CONFIG_IPV6_MULTIPLE_TABLES
1773
1771static int ip6_pkt_prohibit(struct sk_buff *skb) 1774static int ip6_pkt_prohibit(struct sk_buff *skb)
1772{ 1775{
1773 return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED); 1776 return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED);
@@ -1785,6 +1788,8 @@ static int ip6_pkt_blk_hole(struct sk_buff *skb)
1785 return 0; 1788 return 0;
1786} 1789}
1787 1790
1791#endif
1792
1788/* 1793/*
1789 * Allocate a dst for local (unicast / anycast) address. 1794 * Allocate a dst for local (unicast / anycast) address.
1790 */ 1795 */