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

Commit bcfd3432 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Cleanup FDB handling code 



This change makes it so that the behavior for FDB handling is consistent
between both the SR-IOV and non-SR-IOV cases.  The main change here is that we
perform bounds checking on the number of SR-IOV addresses regardless of if
SR-IOV is enabled or not as we can only support a certain number of addresses
in the hardware.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c24817b6

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

+4 −30
Original line number Diff line number Diff line
@@ -7741,39 +7741,13 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
			     const unsigned char *addr,

			     u16 flags)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int err;



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

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



	/* Hardware does not support aging addresses so if a

	 * ndm_state is given only allow permanent addresses

	 */

	if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {

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

			ixgbe_driver_name);

		return -EINVAL;

	}



	/* guarantee we can provide a unique filter for the unicast address */

	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr)) {

		u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;



		if (netdev_uc_count(dev) < rar_uc_entries)

			err = dev_uc_add_excl(dev, addr);

		else

			err = -ENOMEM;

	} else if (is_multicast_ether_addr(addr)) {

		err = dev_mc_add_excl(dev, addr);

	} else {

		err = -EINVAL;

		if (IXGBE_MAX_PF_MACVLANS <= netdev_uc_count(dev))

			return -ENOMEM;

	}



	/* Only return duplicate errors if NLM_F_EXCL is set */

	if (err == -EEXIST && !(flags & NLM_F_EXCL))

		err = 0;



	return err;

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

}



static int ixgbe_ndo_bridge_setlink(struct net_device *dev,