Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b13fb45 authored Jul 18, 2012 by Padmanabh Ratnakar Committed by David S. Miller Jul 18, 2012

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>

parent c3fe065c

drivers/net/ethernet/emulex/benet/be_cmds.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1631,6 +1631,7 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
	/* Reset mcast promisc mode if already set by setting mask		/* Reset mcast promisc mode if already set by setting mask
	* and not setting flags field		* and not setting flags field
	*/		*/
			if (!lancer_chip(adapter) \|\| be_physfn(adapter))
	req->if_flags_mask \|=		req->if_flags_mask \|=
	cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);		cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);

drivers/net/ethernet/emulex/benet/be_main.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2772,6 +2772,13 @@ static int be_setup(struct be_adapter *adapter)
	en_flags \|= BE_IF_FLAGS_RSS;		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,		status = be_cmd_if_create(adapter, cap_flags, en_flags,
	&adapter->if_handle, 0);		&adapter->if_handle, 0);
	if (status != 0)		if (status != 0)