From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Yasevich Subject: Re: [RFC PATCH 2/3] ixgbe: Use default fdb handlers when not in VF mode. Date: Thu, 28 Feb 2013 09:46:35 -0500 Message-ID: <512F6DCB.2080408@redhat.com> References: <1361987164-15280-1-git-send-email-vyasevic@redhat.com> <1361987164-15280-3-git-send-email-vyasevic@redhat.com> <512EDC77.5090802@intel.com> Reply-To: vyasevic@redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, "Rose, Gregory V" To: John Fastabend Return-path: Received: from mx1.redhat.com ([209.132.183.28]:51137 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755649Ab3B1Oqk (ORCPT ); Thu, 28 Feb 2013 09:46:40 -0500 In-Reply-To: <512EDC77.5090802@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: On 02/27/2013 11:26 PM, John Fastabend wrote: > On 2/27/2013 9:46 AM, Vlad Yasevich wrote: >> Allow the use of ndo_dflt_fdb_ 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 >> Signed-off-by: Vlad Yasevich >> --- >> 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. OK. I took the safe approach and kept the functions. The only difference right now is that right now with VF configured, fdb_add refuses to add more then IXGBE_MAX_PF_MACVLANS and thus never would enter into promisc mode. I am not sure if that how its supposed to be have or not. That's one of the reasons I kept this around. -vlad > >> 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. > >> 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. >