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

be2net: non-member vlan pkts not received in promiscous mode

Browse Source 
While configuring promiscous mode, explicitly set the
VLAN_PROMISCOUS bit to make this happen. When switching off
promiscous mode, re-program the vids.

Signed-off-by: Xavier Selvin <xavier.selvin@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla 2011-08-02 19:57:43 +00:00 committed by David S. Miller
parent ea172a011d
commit c0e64ef489
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/benet/be_cmds.c
View File

@ -1586,9 +1586,11 @@ int be_cmd_promiscuous_config(struct be_adapter *adapter, bool en)
OPCODE_COMMON_NTWK_RX_FILTER, sizeof(*req)); OPCODE_COMMON_NTWK_RX_FILTER, sizeof(*req));
req->if_id = cpu_to_le32(adapter->if_handle); req->if_id = cpu_to_le32(adapter->if_handle);
req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS); req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS
| BE_IF_FLAGS_VLAN_PROMISCUOUS);
if (en) if (en)
req->if_flags = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS); req->if_flags = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS
| BE_IF_FLAGS_VLAN_PROMISCUOUS);
sge->pa_hi = cpu_to_le32(upper_32_bits(promiscous_cmd.dma)); sge->pa_hi = cpu_to_le32(upper_32_bits(promiscous_cmd.dma));
sge->pa_lo = cpu_to_le32(promiscous_cmd.dma & 0xFFFFFFFF); sge->pa_lo = cpu_to_le32(promiscous_cmd.dma & 0xFFFFFFFF);

7
drivers/net/benet/be_main.c
View File

@ -728,6 +728,10 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
status = be_cmd_vlan_config(adapter, if_handle, vtag, 1, 1, 0); status = be_cmd_vlan_config(adapter, if_handle, vtag, 1, 1, 0);
} }
/* No need to further configure vids if in promiscuous mode */
if (adapter->promiscuous)
return 0;
if (adapter->vlans_added <= adapter->max_vlans) { if (adapter->vlans_added <= adapter->max_vlans) {
/* Construct VLAN Table to give to HW */ /* Construct VLAN Table to give to HW */
for (i = 0; i < VLAN_N_VID; i++) { for (i = 0; i < VLAN_N_VID; i++) {
@ -787,6 +791,9 @@ static void be_set_multicast_list(struct net_device *netdev)
if (adapter->promiscuous) { if (adapter->promiscuous) {
adapter->promiscuous = false; adapter->promiscuous = false;
be_cmd_promiscuous_config(adapter, false); be_cmd_promiscuous_config(adapter, false);
if (adapter->vlans_added)
be_vid_config(adapter, false, 0);
} }
/* Enable multicast promisc if num configured exceeds what we support */ /* Enable multicast promisc if num configured exceeds what we support */