diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /net/ipv4/icmp.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 233de0634298..82baea026484 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -540,7 +540,6 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
| 540 | icmp_param.data.icmph.checksum = 0; | 540 | icmp_param.data.icmph.checksum = 0; |
| 541 | icmp_param.skb = skb_in; | 541 | icmp_param.skb = skb_in; |
| 542 | icmp_param.offset = skb_network_offset(skb_in); | 542 | icmp_param.offset = skb_network_offset(skb_in); |
| 543 | icmp_out_count(icmp_param.data.icmph.type); | ||
| 544 | inet_sk(icmp_socket->sk)->tos = tos; | 543 | inet_sk(icmp_socket->sk)->tos = tos; |
| 545 | ipc.addr = iph->saddr; | 544 | ipc.addr = iph->saddr; |
| 546 | ipc.opt = &icmp_param.replyopts; | 545 | ipc.opt = &icmp_param.replyopts; |