From 615493ae4776c6899cf3e5faf186ca754b1814e4 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 18 Oct 2006 21:20:57 -0700 Subject: [PATCH] --- yaml --- r: 40051 b: refs/heads/master c: 6723ab549df777742801716d7aeea397e6e97f2c h: refs/heads/master i: 40049: 9b01bda7d3e4e94f00b9dba5e5857f6d44e1adc2 40047: c9b9da4687e6e32c5b7ceb87cb7ebceba961f467 v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ff8346718ad..dde6c348adb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ba7511b7c8b71d5148f7516584d0b677acc384a +refs/heads/master: 6723ab549df777742801716d7aeea397e6e97f2c diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 5c00ca4fa52c..c953466b7afd 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/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. */