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

Commit faaf02d2 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

ixgbe: Make use of the default fdb handlers. 



For fdb_add, use the default handler in the non-SRIOV case.
For the other fdb handlers, just remove them and use the
default ones.

CC: John Fastabend <john.r.fastabend@intel.com>
Acked-By: default avatarJohn Fastabend <john.r.fastabend@intel.com>
CC: CC: Gregory Rose <gregory.v.rose@intel.com>
Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 090096bf

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −41
Original line number Original line Diff line number Diff line
@@ -7007,7 +7007,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	int err;

	int err;





	if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

	if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

		return -EOPNOTSUPP;

		return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags);





	/* Hardware does not support aging addresses so if a

	/* Hardware does not support aging addresses so if a

	 * ndm_state is given only allow permanent addresses

	 * ndm_state is given only allow permanent addresses
@@ -7038,44 +7038,6 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	return err;

	return err;

}

}





static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

			     struct net_device *dev,

			     const unsigned char *addr)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int err = -EOPNOTSUPP;



	if (ndm->ndm_state & NUD_PERMANENT) {

		pr_info("%s: FDB only supports static addresses\n",

			ixgbe_driver_name);

		return -EINVAL;

	}



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {

		if (is_unicast_ether_addr(addr))

			err = dev_uc_del(dev, addr);

		else if (is_multicast_ether_addr(addr))

			err = dev_mc_del(dev, addr);

		else

			err = -EINVAL;

	}



	return err;

}



static int ixgbe_ndo_fdb_dump(struct sk_buff *skb,

			      struct netlink_callback *cb,

			      struct net_device *dev,

			      int idx)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);



	return idx;

}



static int ixgbe_ndo_bridge_setlink(struct net_device *dev,

static int ixgbe_ndo_bridge_setlink(struct net_device *dev,

				    struct nlmsghdr *nlh)

				    struct nlmsghdr *nlh)

{

{
@@ -7171,8 +7133,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_set_features = ixgbe_set_features,

	.ndo_set_features = ixgbe_set_features,

	.ndo_fix_features = ixgbe_fix_features,

	.ndo_fix_features = ixgbe_fix_features,

	.ndo_fdb_add		= ixgbe_ndo_fdb_add,

	.ndo_fdb_add		= ixgbe_ndo_fdb_add,

	.ndo_fdb_del		= ixgbe_ndo_fdb_del,

	.ndo_fdb_dump		= ixgbe_ndo_fdb_dump,

	.ndo_bridge_setlink	= ixgbe_ndo_bridge_setlink,

	.ndo_bridge_setlink	= ixgbe_ndo_bridge_setlink,

	.ndo_bridge_getlink	= ixgbe_ndo_bridge_getlink,

	.ndo_bridge_getlink	= ixgbe_ndo_bridge_getlink,

};

};