diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-05-27 22:46:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-03 09:07:42 +0200 |
| commit | 387aa65a89434abe3128d36d1a6fc3842c94905d (patch) | |
| tree | 65ca8ab0c6224eb39941455b1eb0abd2fa410035 /net/ipv4/ipcomp.c | |
| parent | bnx2x: fix a power state test (diff) | |
| download | linux-387aa65a89434abe3128d36d1a6fc3842c94905d.tar.xz linux-387aa65a89434abe3128d36d1a6fc3842c94905d.zip | |
ipv4: properly refresh rtable entries on pmtu/redirect events
This reverts commit 05ab86c5 (xfrm4: Invalidate all ipv4 routes on
IPsec pmtu events). Flushing all cached entries is not needed.
Instead, invalidate only the related next hop dsts to recheck for
the added next hop exception where needed. This also fixes a subtle
race due to bumping generation id's before updating the pmtu.
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 59cb8c769056..826be4cb482a 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -47,12 +47,9 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) if (!x) return; - if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { - atomic_inc(&flow_cache_genid); - rt_genid_bump(net); - + if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0); - } else + else ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0); xfrm_state_put(x); } |