diff options
author | Li Wei <lw@cn.fujitsu.com> | 2013-02-21 17:18:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-22 15:10:18 -0500 |
commit | 5b0520425e5ea81ba95ec486dd6bbb59a09fff0e (patch) | |
tree | e506570823deb8fd65e52e34fe67cf327af2266e /net/ipv4/af_inet.c | |
parent | 08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664 (diff) |
ipv4: fix error handling in icmp_protocol.
Now we handle icmp errors in each transport protocol's err_handler,
for icmp protocols, that is ping_err. Since this handler only care
of those icmp errors triggered by echo request, errors triggered
by echo reply(which sent by kernel) are sliently ignored.
So wrap ping_err() with icmp_err() to deal with those icmp errors.
Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 9cbcb94a4c6d..15847e19b7dd 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1577,7 +1577,7 @@ static const struct net_offload udp_offload = { | |||
1577 | 1577 | ||
1578 | static const struct net_protocol icmp_protocol = { | 1578 | static const struct net_protocol icmp_protocol = { |
1579 | .handler = icmp_rcv, | 1579 | .handler = icmp_rcv, |
1580 | .err_handler = ping_err, | 1580 | .err_handler = icmp_err, |
1581 | .no_policy = 1, | 1581 | .no_policy = 1, |
1582 | .netns_ok = 1, | 1582 | .netns_ok = 1, |
1583 | }; | 1583 | }; |