From 659d75b74d4aa082239a68eac74b1f8ca8c50f3a Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Tue, 5 Jun 2012 19:37:17 +0000 Subject: [PATCH] --- yaml --- r: 313885 b: refs/heads/master c: 1d1e9a467c7a478d24a1af39e467a414a8363661 h: refs/heads/master i: 313883: 8cbe1985fdcdfea23eaa171c0a89eb3cb28af8bc v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df907a65ae03..13a87ea6db41 100644 --- 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 index 08efd308d78a..f1b092692aa5 100644 --- 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);