aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-10-18 21:20:57 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-18 21:20:57 -0700
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 5c00ca4fa52..c953466b7af 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -94,9 +94,6 @@ static int ip6_dst_gc(void);
static int ip6_pkt_discard(struct sk_buff *skb);
static int ip6_pkt_discard_out(struct sk_buff *skb);
-static int ip6_pkt_prohibit(struct sk_buff *skb);
-static int ip6_pkt_prohibit_out(struct sk_buff *skb);
-static int ip6_pkt_blk_hole(struct sk_buff *skb);
static void ip6_link_failure(struct sk_buff *skb);
static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu);
@@ -144,6 +141,10 @@ struct rt6_info ip6_null_entry = {
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+static int ip6_pkt_prohibit(struct sk_buff *skb);
+static int ip6_pkt_prohibit_out(struct sk_buff *skb);
+static int ip6_pkt_blk_hole(struct sk_buff *skb);
+
struct rt6_info ip6_prohibit_entry = {
.u = {
.dst = {
@@ -1768,6 +1769,8 @@ static int ip6_pkt_discard_out(struct sk_buff *skb)
return ip6_pkt_discard(skb);
}
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+
static int ip6_pkt_prohibit(struct sk_buff *skb)
{
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED);
@@ -1785,6 +1788,8 @@ static int ip6_pkt_blk_hole(struct sk_buff *skb)
return 0;
}
+#endif
+
/*
* Allocate a dst for local (unicast / anycast) address.
*/