From patchwork Thu Dec 13 06:49:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Quantal, 01/29] be2net: don't call vid_config() when there's no vlan config Date: Wed, 12 Dec 2012 20:49:34 -0000 From: Jesse Sung X-Patchwork-Id: 205744 Message-Id: <1355381402-10497-1-git-send-email-jesse.sung@canonical.com> To: kernel-team@lists.ubuntu.com Cc: Sathya Perla , Sarveshwar Bandi From: Sathya Perla BugLink: https://launchpad.net/bugs/1083088 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 (cherry picked from commit 1d1e9a467c7a478d24a1af39e467a414a8363661) Signed-off-by: Wen-chien Jesse Sung --- drivers/net/ethernet/emulex/benet/be_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index bd5cf7e..257c7f3 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2763,7 +2763,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);