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

Commit 9df70b66 authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by Jeff Kirsher
Browse files

i40e: Remove incorrect #ifdef's 



This patch removes some #ifdef's that should not be there. They
were stopping code that is needed from being compiled in.

With these #ifdef's removed, changes are needed in the driver
to fix some compile errors: adding missing parameters to
the definition of ndo_bridge_setlink and a ndo_dflt_brige_getlink call.

Change-ID: I5516614e1bc50b6bca0647cef971bc96161ba2de
Signed-off-by: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 85927ec1

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −10
Original line number Diff line number Diff line
@@ -7993,7 +7993,6 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	return err;

}



#ifdef HAVE_BRIDGE_ATTRIBS

/**

 * i40e_ndo_bridge_setlink - Set the hardware bridge mode

 * @dev: the netdev being configured
@@ -8007,7 +8006,8 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
 * bridge mode enabled.

 **/

static int i40e_ndo_bridge_setlink(struct net_device *dev,

				   struct nlmsghdr *nlh)

				   struct nlmsghdr *nlh,

				   u16 flags)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;
@@ -8078,14 +8078,9 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, 
 * Return the mode in which the hardware bridge is operating in

 * i.e VEB or VEPA.

 **/

#ifdef HAVE_BRIDGE_FILTER

static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				   struct net_device *dev,

				   u32 filter_mask, int nlflags)

#else

static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				   struct net_device *dev, int nlflags)

#endif /* HAVE_BRIDGE_FILTER */

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;
@@ -8109,7 +8104,6 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode,

				       nlflags, 0, 0, filter_mask, NULL);

}

#endif /* HAVE_BRIDGE_ATTRIBS */



#define I40E_MAX_TUNNEL_HDR_LEN 80

/**
@@ -8165,10 +8159,8 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_get_phys_port_id	= i40e_get_phys_port_id,

	.ndo_fdb_add		= i40e_ndo_fdb_add,

	.ndo_features_check	= i40e_features_check,

#ifdef HAVE_BRIDGE_ATTRIBS

	.ndo_bridge_getlink	= i40e_ndo_bridge_getlink,

	.ndo_bridge_setlink	= i40e_ndo_bridge_setlink,

#endif /* HAVE_BRIDGE_ATTRIBS */

};



/**