Re: [RFC PATCH 2/3] ixgbe: Use default fdb handlers when not in VF mode.
From: John Fastabend <hidden>
Date: 2013-02-28 04:27:40
On 2/27/2013 9:46 AM, Vlad Yasevich wrote:
quoted hunk ↗ jump to hunk
Allow the use of ndo_dflt_fdb_<add|del|dump> when the adapter does not have VF configured. This allows for IFF_UNICAST_FLT support and allows VF handling to potentially do something different. CC: John Fastabend <redacted> Signed-off-by: Vlad Yasevich <redacted> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 26 ++++++++++-------------- 1 files changed, 11 insertions(+), 15 deletions(-)diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 68478d6..0ae2525 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c@@ -7007,7 +7007,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
With the first patch we can just remove this routine altogether and let the dflt handler do its work. CC'd Greg in case I miss something.
quoted hunk ↗ jump to hunk
int err; 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 * ndm_state is given only allow permanent addresses@@ -7045,20 +7045,21 @@ static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
same here just remove it and use the dflt handler.
quoted hunk ↗ jump to hunk
struct ixgbe_adapter *adapter = netdev_priv(dev); int err = -EOPNOTSUPP; + if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)) + return ndo_dflt_fdb_del(ndm, tb, dev, addr); + 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; - } + 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; }@@ -7068,12 +7069,7 @@ static int ixgbe_ndo_fdb_dump(struct sk_buff *skb, struct net_device *dev, int idx) {
This is the same as not defining the op at all right? Just remove it.
- 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; + return ndo_dflt_fdb_dump(skb, cb, dev, idx); } static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
Then we get a patch with all '-' which is sort of nice.