diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
| commit | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (patch) | |
| tree | d938e61f953ca63a745e7ace4a78c16876509ed5 /net/core/netpoll.c | |
| parent | 8f28afac3494f573ac774030a1f840b7d6237da2 (diff) | |
| parent | 3860288ee8298bf2784e9a0c37d26d3a82941e35 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 281a632fa6a6..ea51f8d02eb8 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -703,7 +703,7 @@ int netpoll_setup(struct netpoll *np) } } - if (!memcmp(np->local_mac, "\0\0\0\0\0\0", 6) && ndev->dev_addr) + if (is_zero_ether_addr(np->local_mac) && ndev->dev_addr) memcpy(np->local_mac, ndev->dev_addr, 6); if (!np->local_ip) { |