diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 16:41:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 16:41:37 -0800 |
| commit | 94c16ea6ea75f8f5de92d10a647155ccf0d05436 (patch) | |
| tree | 012d247bf686e1c49ef3ad0048b94de4970c066b /net/ipv4/ipcomp.c | |
| parent | cf55f672c325f234d96911571a775b2e7d9cf284 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
Merge tag 'v3.8-rc6' into next/cleanup
Linux 3.8-rc6
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index d3ab47e19a89..9a46daed2f3c 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -47,9 +47,12 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) if (!x) return; - if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) + if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { + atomic_inc(&flow_cache_genid); + rt_genid_bump(net); + 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); } |