Skip to content

Commit

Permalink
be2net: Fix VF driver load for Lancer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Padmanabh Ratnakar authored and David S. Miller committed Jul 18, 2012
1 parent c3fe065 commit 0b13fb4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/emulex/benet/be_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
7 changes: 7 additions & 0 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2772,6 +2772,13 @@ static int be_setup(struct be_adapter *adapter)
en_flags |= BE_IF_FLAGS_RSS;
}

if (lancer_chip(adapter) && !be_physfn(adapter)) {
en_flags = BE_IF_FLAGS_UNTAGGED |
BE_IF_FLAGS_BROADCAST |
BE_IF_FLAGS_MULTICAST;
cap_flags = en_flags;
}

status = be_cmd_if_create(adapter, cap_flags, en_flags,
&adapter->if_handle, 0);
if (status != 0)
Expand Down

0 comments on commit 0b13fb4

Please sign in to comment.