diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 16:44:43 -0500 |
| commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
| tree | 90537ddf035e96ca3182f61755ed234de93b449b /net/core/dv.c | |
| parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
| parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dv.c')
| -rw-r--r-- | net/core/dv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dv.c b/net/core/dv.c index 3f25f4aa4e6..c5deb365525 100644 --- a/net/core/dv.c +++ b/net/core/dv.c | |||
| @@ -457,7 +457,7 @@ void divert_frame(struct sk_buff *skb) | |||
| 457 | unsigned char *skb_data_end = skb->data + skb->len; | 457 | unsigned char *skb_data_end = skb->data + skb->len; |
| 458 | 458 | ||
| 459 | /* Packet is already aimed at us, return */ | 459 | /* Packet is already aimed at us, return */ |
| 460 | if (!memcmp(eth, skb->dev->dev_addr, ETH_ALEN)) | 460 | if (!compare_ether_addr(eth, skb->dev->dev_addr)) |
| 461 | return; | 461 | return; |
| 462 | 462 | ||
| 463 | /* proto is not IP, do nothing */ | 463 | /* proto is not IP, do nothing */ |