diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 14:10:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 14:10:29 -0500 |
| commit | 98bd0c07b60e029cf53eb76c027c27548dd66e9b (patch) | |
| tree | 8542c44cc8d1f05a533fb82e04173549196f112d /net/ipv4/icmp.c | |
| parent | 5e375bc7d586e0df971734a5a5f1f080ffd89b68 (diff) | |
| parent | 7918d212df31fb7ddfb317c5a8dccdcec647d754 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 6bc0887b0834..4d1c40972a4b 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -524,7 +524,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info) | |||
| 524 | iph->tos; | 524 | iph->tos; |
| 525 | 525 | ||
| 526 | if (ip_options_echo(&icmp_param.replyopts, skb_in)) | 526 | if (ip_options_echo(&icmp_param.replyopts, skb_in)) |
| 527 | goto ende; | 527 | goto out_unlock; |
| 528 | 528 | ||
| 529 | 529 | ||
| 530 | /* | 530 | /* |