diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:12:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:12:52 -0500 |
| commit | 1fd5a46dd6bbca3a1275465120caf4748872c2a7 (patch) | |
| tree | c24862a43f57974394ebb58a1d9005e4093e3bf7 /net/ipv4/icmp.c | |
| parent | 2cc6055060d975e8c7601f4a1c68ef2d3050b4e9 (diff) | |
| parent | dff2c03534f525813342ab8dec90c5bb1ee07471 (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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index be5a519cd2f8..105039eb7629 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
| @@ -899,8 +899,7 @@ static void icmp_address_reply(struct sk_buff *skb) | |||
| 899 | u32 _mask, *mp; | 899 | u32 _mask, *mp; |
| 900 | 900 | ||
| 901 | mp = skb_header_pointer(skb, 0, sizeof(_mask), &_mask); | 901 | mp = skb_header_pointer(skb, 0, sizeof(_mask), &_mask); |
| 902 | if (mp == NULL) | 902 | BUG_ON(mp == NULL); |
| 903 | BUG(); | ||
| 904 | for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { | 903 | for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { |
| 905 | if (*mp == ifa->ifa_mask && | 904 | if (*mp == ifa->ifa_mask && |
| 906 | inet_ifa_match(rt->rt_src, ifa)) | 905 | inet_ifa_match(rt->rt_src, ifa)) |