projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbfc607
)
be2net: don't call vid_config() when there's no vlan config
author
Sathya Perla
<
[email protected]
>
Tue, 5 Jun 2012 19:37:17 +0000
(19:37 +0000)
committer
David S. Miller
<
[email protected]
>
Wed, 6 Jun 2012 16:06:17 +0000
(09:06 -0700)
be_vid_config() is called from be_setup() to replay config cmds after
a card reset. Skip calling it when no vlans are configured.
Signed-off-by: Sathya Perla <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/emulex/benet/be_main.c
b/drivers/net/ethernet/emulex/benet/be_main.c
index 08efd308d78ae40640f73953a41531aabba2c054..f1b092692aa5f891899984e1b04ae0abfce12aa2 100644
(file)
--- a/
drivers/net/ethernet/emulex/benet/be_main.c
+++ b/
drivers/net/ethernet/emulex/benet/be_main.c
@@
-2762,7
+2762,8
@@
static int be_setup(struct be_adapter *adapter)
be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
- be_vid_config(adapter, false, 0);
+ if (adapter->vlans_added)
+ be_vid_config(adapter, false, 0);
be_set_rx_mode(adapter->netdev);