diff options
| author | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /net/core | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 43e61ba7bd9..6a94475aee8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4007,9 +4007,7 @@ static void dev_unicast_flush(struct net_device *dev) static void dev_unicast_init(struct net_device *dev) { - netif_addr_lock_bh(dev); __hw_addr_init(&dev->uc); - netif_addr_unlock_bh(dev); } |