[Quantal][PATCH 01/29] be2net: don't call vid_config() when there's no vlan config

[Tim Gardner]

On 12/12/2012 11:49 PM, Jesse Sung wrote:
> From: Sathya Perla <sathya.perla at emulex.com>
> 
> 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 <sathya.perla at emulex.com>
> Signed-off-by: David S. Miller <davem at davemloft.net>
> (cherry picked from commit 1d1e9a467c7a478d24a1af39e467a414a8363661)
> 
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
> ---
>  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);
>  
> 


Be careful to change the commit log from 'cherry-picked' to 'back
ported' if there are _any_ conflicts.

I see there are 27 commits against be2net since v3.7. Are any of those
appropriate ? Looks like a lot of bug fixes.

Finally, as Brad requested, we'd like some test results.

rtg
-- 
Tim Gardner tim.gardner at canonical.com