diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/ipv4/xfrm4_protocol.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/ipv4/xfrm4_protocol.c')
| -rw-r--r-- | net/ipv4/xfrm4_protocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_protocol.c b/net/ipv4/xfrm4_protocol.c index a2ce0101eaac..dccefa9d84cf 100644 --- a/net/ipv4/xfrm4_protocol.c +++ b/net/ipv4/xfrm4_protocol.c | |||
| @@ -124,7 +124,7 @@ static int xfrm4_ah_rcv(struct sk_buff *skb) | |||
| 124 | 124 | ||
| 125 | for_each_protocol_rcu(ah4_handlers, handler) | 125 | for_each_protocol_rcu(ah4_handlers, handler) |
| 126 | if ((ret = handler->handler(skb)) != -EINVAL) | 126 | if ((ret = handler->handler(skb)) != -EINVAL) |
| 127 | return ret;; | 127 | return ret; |
| 128 | 128 | ||
| 129 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); | 129 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); |
| 130 | 130 | ||