---

yaml --- r: 313885 b: refs/heads/master c: 1d1e9a4 h: refs/heads/master i: 313883: 8cbe198 v: v3
git-mirror · Jun 6, 2012 · 659d75b · 659d75b
1 parent 7fbac4a
commit 659d75b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbfc60717b69fb479861f336d42bde640f650ea0
+refs/heads/master: 1d1e9a467c7a478d24a1af39e467a414a8363661
diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/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);