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

Commit ce7fa78c authored Jul 30, 2015 by Yuval Mintz Committed by David S. Miller Jul 30, 2015

bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set



Commit 05cc5a39 ("bnx2x: add vlan filtering offload") has broken
compilation when CONFIG_BNX2X_SRIOV is not set.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cfcbe858

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13091,8 +13091,10 @@ static int bnx2x_init_dev(struct bnx2x bp, struct pci_dev pdev,
	bp->accept_any_vlan = true;		bp->accept_any_vlan = true;
	else		else
	dev->hw_features \|= NETIF_F_HW_VLAN_CTAG_FILTER;		dev->hw_features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
			#ifdef CONFIG_BNX2X_SRIOV
	} else if (bp->acquire_resp.pfdev_info.pf_cap & PFVF_CAP_VLAN_FILTER) {		} else if (bp->acquire_resp.pfdev_info.pf_cap & PFVF_CAP_VLAN_FILTER) {
	dev->hw_features \|= NETIF_F_HW_VLAN_CTAG_FILTER;		dev->hw_features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
			#endif
	}		}

	dev->features \|= dev->hw_features \| NETIF_F_HW_VLAN_CTAG_RX;		dev->features \|= dev->hw_features \| NETIF_F_HW_VLAN_CTAG_RX;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -551,6 +551,11 @@ int bnx2x_set_vf_link_state(struct net_device *dev, int vf, int link_state);
	int bnx2x_vfpf_update_vlan(struct bnx2x *bp, u16 vid, u8 vf_qid, bool add);		int bnx2x_vfpf_update_vlan(struct bnx2x *bp, u16 vid, u8 vf_qid, bool add);
	#else /* CONFIG_BNX2X_SRIOV */		#else /* CONFIG_BNX2X_SRIOV */

			#define GET_NUM_VFS_PER_PATH(bp) 0
			#define GET_NUM_VFS_PER_PF(bp) 0
			#define VF_MAC_CREDIT_CNT 0
			#define VF_VLAN_CREDIT_CNT 0

	static inline void bnx2x_iov_set_queue_sp_obj(struct bnx2x *bp, int vf_cid,		static inline void bnx2x_iov_set_queue_sp_obj(struct bnx2x *bp, int vf_cid,
	struct bnx2x_queue_sp_obj **q_obj) {}		struct bnx2x_queue_sp_obj **q_obj) {}
	static inline void bnx2x_vf_handle_flr_event(struct bnx2x *bp) {}		static inline void bnx2x_vf_handle_flr_event(struct bnx2x *bp) {}