be2net: don't call vid_config() when there's no vlan config

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / emulex / benet / be_main.c

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);