From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 19 Oct 2006 04:20:57 +0000 (-0700)
Subject: [IPV6]: Fix route.c warnings when multiple tables are disabled.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6723ab549df777742801716d7aeea397e6e97f2c;p=linux-beck.git

[IPV6]: Fix route.c warnings when multiple tables are disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

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);
 
 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.
  */