git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
drivers
/
net
/
qlcnic
/
qlcnic_main.c
diff --git
a/drivers/net/qlcnic/qlcnic_main.c
b/drivers/net/qlcnic/qlcnic_main.c
index
006a693
..
5ca1b56
100644
(file)
--- a/
drivers/net/qlcnic/qlcnic_main.c
+++ b/
drivers/net/qlcnic/qlcnic_main.c
@@
-4204,7
+4204,7
@@
qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
qlcnic_config_indev_addr(adapter, netdev, event);
for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
- dev =
vlan_find_dev
(netdev, vid);
+ dev =
__vlan_find_dev_deep
(netdev, vid);
if (!dev)
continue;
qlcnic_config_indev_addr(adapter, dev, event);