diff options
| author | Li Wei <lw@cn.fujitsu.com> | 2013-02-21 22:18:44 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 13:38:41 (GMT) |
| commit | 88bb40ba28f2ff6baf103b084eaaca8974b0a915 (patch) | |
| tree | afe86f353eb31b843409bbc5087f36f7749c8c2f /net/ipv4/af_inet.c | |
| parent | 7e122d3c7c52acfa96c2939db26e7fd3cc96a651 (diff) | |
| download | linux-fsl-qoriq-88bb40ba28f2ff6baf103b084eaaca8974b0a915.tar.xz | |
ipv4: fix error handling in icmp_protocol.
[ Upstream commit 5b0520425e5ea81ba95ec486dd6bbb59a09fff0e ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 3f05650..fcf104e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1595,7 +1595,7 @@ static const struct net_offload udp_offload = { static const struct net_protocol icmp_protocol = { .handler = icmp_rcv, - .err_handler = ping_err, + .err_handler = icmp_err, .no_policy = 1, .netns_ok = 1, }; |