From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Alexander Duyck <alexander.h.duyck@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/10] ixgbe: Assume provided MAC filter has been verified by macvlan
Date: Fri, 12 Jan 2018 09:29:23 -0800 [thread overview]
Message-ID: <20180112172932.46683-2-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20180112172932.46683-1-jeffrey.t.kirsher@intel.com>
From: Alexander Duyck <alexander.h.duyck@intel.com>
The macvlan driver itself will validate the MAC address that is configured
for a given interface. There is no need for us to verify it again.
Instead we should be checking to verify that we actually allocate the filter
and have not run out of resources to configure a MAC rule in our filter
table.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e47e0c470508..9416531335f7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -5406,12 +5406,16 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev,
if (err)
goto fwd_queue_err;
- if (is_valid_ether_addr(vdev->dev_addr))
- ixgbe_add_mac_filter(adapter, vdev->dev_addr,
- VMDQ_P(accel->pool));
+ /* ixgbe_add_mac_filter will return an index if it succeeds, so we
+ * need to only treat it as an error value if it is negative.
+ */
+ err = ixgbe_add_mac_filter(adapter, vdev->dev_addr,
+ VMDQ_P(accel->pool));
+ if (err < 0)
+ goto fwd_queue_err;
ixgbe_macvlan_set_rx_mode(vdev, VMDQ_P(accel->pool), adapter);
- return err;
+ return 0;
fwd_queue_err:
ixgbe_fwd_ring_down(vdev, accel);
return err;
--
2.15.1
next prev parent reply other threads:[~2018-01-12 17:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-12 17:29 [net-next 00/10][pull request] 10GbE Intel Wired LAN Driver Updates 2018-01-12 Jeff Kirsher
2018-01-12 17:29 ` Jeff Kirsher [this message]
2018-01-12 17:29 ` [net-next 02/10] ixgbe: Default to 1 pool always being allocated Jeff Kirsher
2018-01-12 17:29 ` [net-next 03/10] ixgbe: Don't assume dev->num_tc is equal to hardware TC config Jeff Kirsher
2018-01-12 17:29 ` [net-next 04/10] ixgbe/fm10k: Record macvlan stats instead of Rx queue for macvlan offloaded rings Jeff Kirsher
2018-01-12 17:29 ` [net-next 05/10] ixgbe: Do not manipulate macvlan Tx queues when performing macvlan offload Jeff Kirsher
2018-01-12 17:29 ` [net-next 06/10] ixgbe: avoid bringing rings up/down as macvlans are added/removed Jeff Kirsher
2018-01-12 17:29 ` [net-next 07/10] ixgbe: Fix handling of macvlan Tx offload Jeff Kirsher
2018-01-12 17:29 ` [net-next 08/10] net: Cap number of queues even with accel_priv Jeff Kirsher
2018-01-12 17:29 ` [net-next 09/10] ixgbe: Fix kernel-doc format warnings Jeff Kirsher
2018-01-12 17:29 ` [net-next 10/10] ixgbevf: " Jeff Kirsher
2018-01-14 17:25 ` [net-next 00/10][pull request] 10GbE Intel Wired LAN Driver Updates 2018-01-12 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180112172932.46683-2-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=alexander.h.duyck@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).