summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2012-06-05 19:37:17 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-06-06 16:06:17 (GMT)
commit1d1e9a467c7a478d24a1af39e467a414a8363661 (patch)
treeb3fdb11996823108b313697ef59a62376debea11 /drivers/net
parentcbfc60717b69fb479861f336d42bde640f650ea0 (diff)
downloadlinux-fsl-qoriq-1d1e9a467c7a478d24a1af39e467a414a8363661.tar.xz
be2net: don't call vid_config() when there's no vlan config
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 <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 08efd30..f1b0926 100644
--- 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);