aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2017-11-22 13:56:59 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-01-12 11:19:26 -0500
commit4a2512cfdfe9ed2d9cdbbcced7d81362292105b0 (patch)
tree2a25f6aa2caabf7df5a67f884afcc54658bf9f02
parent6bd39bc3da0f4a301fae69c4a32db2768f5118be (diff)
ixgbe: Assume provided MAC filter has been verified by macvlan
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>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c12
1 files 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,
5406 if (err) 5406 if (err)
5407 goto fwd_queue_err; 5407 goto fwd_queue_err;
5408 5408
5409 if (is_valid_ether_addr(vdev->dev_addr)) 5409 /* ixgbe_add_mac_filter will return an index if it succeeds, so we
5410 ixgbe_add_mac_filter(adapter, vdev->dev_addr, 5410 * need to only treat it as an error value if it is negative.
5411 VMDQ_P(accel->pool)); 5411 */
5412 err = ixgbe_add_mac_filter(adapter, vdev->dev_addr,
5413 VMDQ_P(accel->pool));
5414 if (err < 0)
5415 goto fwd_queue_err;
5412 5416
5413 ixgbe_macvlan_set_rx_mode(vdev, VMDQ_P(accel->pool), adapter); 5417 ixgbe_macvlan_set_rx_mode(vdev, VMDQ_P(accel->pool), adapter);
5414 return err; 5418 return 0;
5415fwd_queue_err: 5419fwd_queue_err:
5416 ixgbe_fwd_ring_down(vdev, accel); 5420 ixgbe_fwd_ring_down(vdev, accel);
5417 return err; 5421 return err;