leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

be2net: query FW to check if EVB is enabled

Browse Source 
The current code assumes that bridge functionality (EVB) in the adapter
is enabled only when SR-IOV is enabled. This is not always true.
This patch uses the GET_HSW_CONFIG FW cmd to query this from the FW.

Signed-off-by: Kalesh AP <kalesh.purayil@avagotech.com>
Signed-off-by: Sathya Perla <sathya.perla@avagotech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kalesh Purayil
2015-07-10 05:32:44 -04:00
committed by David S. Miller
parent 145155e786
commit ff9ed19d26
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/emulex/benet/be_cmds.h
View File

@@ -1758,6 +1758,7 @@ struct be_cmd_req_set_mac_list {
/*********************** HSW Config ***********************/ /*********************** HSW Config ***********************/
#define PORT_FWD_TYPE_VEPA 0x3 #define PORT_FWD_TYPE_VEPA 0x3
#define PORT_FWD_TYPE_VEB 0x2 #define PORT_FWD_TYPE_VEB 0x2
#define PORT_FWD_TYPE_PASSTHRU 0x1
#define ENABLE_MAC_SPOOFCHK 0x2 #define ENABLE_MAC_SPOOFCHK 0x2
#define DISABLE_MAC_SPOOFCHK 0x3 #define DISABLE_MAC_SPOOFCHK 0x3

6
drivers/net/ethernet/emulex/benet/be_main.c
View File

@@ -5073,9 +5073,6 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
int status = 0; int status = 0;
u8 hsw_mode; u8 hsw_mode;
if (!sriov_enabled(adapter))
return 0;
/* BE and Lancer chips support VEB mode only */ /* BE and Lancer chips support VEB mode only */
if (BEx_chip(adapter) || lancer_chip(adapter)) { if (BEx_chip(adapter) || lancer_chip(adapter)) {
hsw_mode = PORT_FWD_TYPE_VEB; hsw_mode = PORT_FWD_TYPE_VEB;
@@ -5085,6 +5082,9 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
NULL); NULL);
if (status) if (status)
return 0; return 0;
if (hsw_mode == PORT_FWD_TYPE_PASSTHRU)
return 0;
} }
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, return ndo_dflt_bridge_getlink(skb, pid, seq, dev,