summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex/benet/be_cmds.c
diff options
context:
space:
mode:
authorPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>2012-07-18 02:51:58 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-18 09:28:38 -0700
commit0b13fb458fe6d244baaa701049c9a51105224820 (patch)
tree9f00d7b106586938b5acf9c3f8d7431cc55647ce /drivers/net/ethernet/emulex/benet/be_cmds.c
parentc3fe065cea56f1fcd4f8e4ae1fb15fa785d2bb79 (diff)
downloadtalos-obmc-linux-0b13fb458fe6d244baaa701049c9a51105224820.tar.gz
talos-obmc-linux-0b13fb458fe6d244baaa701049c9a51105224820.zip
be2net: Fix VF driver load for Lancer
Lancer FW has added new capability checks for VFs. Driver should only use those capabilities which are allowed for VFs. Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_cmds.c')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index ddfca658559d..793249053066 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1631,7 +1631,8 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
/* Reset mcast promisc mode if already set by setting mask
* and not setting flags field
*/
- req->if_flags_mask |=
+ if (!lancer_chip(adapter) || be_physfn(adapter))
+ req->if_flags_mask |=
cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
req->mcast_num = cpu_to_le32(netdev_mc_count(adapter->netdev));
OpenPOWER on IntegriCloud