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

[Brad Figg]

Jesse,

These patches look fine. Can you give me a pull request against a
new Quantal kernel tree? Can you also add the standard SRU text to
the bug and give some indication of the testing that has been done.

Thanks,
Brad

On 12/12/2012 10: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);
>  
> 


-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com