diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2012-06-05 19:37:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-06 09:06:17 -0700 |
| commit | 1d1e9a467c7a478d24a1af39e467a414a8363661 (patch) | |
| tree | b3fdb11996823108b313697ef59a62376debea11 /drivers/net/ethernet | |
| parent | cbfc60717b69fb479861f336d42bde640f650ea0 (diff) | |
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/ethernet')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 3 |
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 08efd308d78..f1b092692aa 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); |