diff options
| author | Jianzhao Wang <jianzhao.wang@6wind.com> | 2010-09-08 14:35:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:43:19 -0700 |
| commit | 217e4b61e6b5e14f950b5353ba261d9cd8142186 (patch) | |
| tree | 01aa6dc6209fa63a37a3a5dd24bdeba6709d775f | |
| parent | 107ed4220f8884e3ac026636dfc19c45b8fc990a (diff) | |
| download | lwn-217e4b61e6b5e14f950b5353ba261d9cd8142186.tar.gz lwn-217e4b61e6b5e14f950b5353ba261d9cd8142186.zip | |
net: blackhole route should always be recalculated
[ Upstream commit ae2688d59b5f861dc70a091d003773975d2ae7fb ]
Blackhole routes are used when xfrm_lookup() returns -EREMOTE (error
triggered by IKE for example), hence this kind of route is always
temporary and so we should check if a better route exists for next
packets.
Bug has been introduced by commit d11a4dc18bf41719c9f0d7ed494d295dd2973b92.
Signed-off-by: Jianzhao Wang <jianzhao.wang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ipv4/route.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index af86e411a11b..a03c75413509 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2721,6 +2721,11 @@ slow_output: EXPORT_SYMBOL_GPL(__ip_route_output_key); +static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie) +{ + return NULL; +} + static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu) { } @@ -2729,7 +2734,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = { .family = AF_INET, .protocol = cpu_to_be16(ETH_P_IP), .destroy = ipv4_dst_destroy, - .check = ipv4_dst_check, + .check = ipv4_blackhole_dst_check, .update_pmtu = ipv4_rt_blackhole_update_pmtu, .entries = ATOMIC_INIT(0), }; |