From: Sathya Perla Date: Tue, 5 Jun 2012 19:37:17 +0000 (+0000) Subject: be2net: don't call vid_config() when there's no vlan config X-Git-Tag: v2.6.39-400.9.0~386 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26afe800113ce757aa79e3044bb848bd46c03550;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 66b2527ed0a1..81e92f970060 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -2724,7 +2724,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);