ixgbe: Drop l2_accel_priv data pointer from ring struct

The l2 acceleration private pointer isn't needed in the ring struct. It
isn't really used anywhere other than to test and see if we are supporting
an offloaded macvlan netdev, and it is much easier to test netdev for not
being ixgbe based to verify that.

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>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index f656f2bdc570857203a2ddb70ab686637ba74e78..03a4df0bed96c75a2a75cb904abdeb58d4bac7ef 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -333,7 +333,6 @@ struct ixgbe_ring {
        struct net_device *netdev;      /* netdev ring belongs to */
        struct bpf_prog *xdp_prog;
        struct device *dev;             /* device for DMA mapping */
-       struct ixgbe_fwd_adapter *l2_accel_priv;
        void *desc;                     /* descriptor ring memory */
        union {
                struct ixgbe_tx_buffer *tx_buffer_info;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6b61edba8c73a27bded22af048ea5bed657eb72d..e47e0c470508b0f7f10d36880e8de366bd297c9a 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -192,6 +192,13 @@ static struct workqueue_struct *ixgbe_wq;
 static bool ixgbe_check_cfg_remove(struct ixgbe_hw *hw, struct pci_dev *pdev);
 static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *);
 
+static const struct net_device_ops ixgbe_netdev_ops;
+
+static bool netif_is_ixgbe(struct net_device *dev)
+{
+       return dev && (dev->netdev_ops == &ixgbe_netdev_ops);
+}
+
 static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter,
                                          u32 reg, u16 *value)
 {
@@ -4481,8 +4488,9 @@ static void ixgbe_vlan_strip_disable(struct ixgbe_adapter *adapter)
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        struct ixgbe_ring *ring = adapter->rx_ring[i];
 
-                       if (ring->l2_accel_priv)
+                       if (!netif_is_ixgbe(ring->netdev))
                                continue;
+
                        j = ring->reg_idx;
                        vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
                        vlnctrl &= ~IXGBE_RXDCTL_VME;
@@ -4518,8 +4526,9 @@ static void ixgbe_vlan_strip_enable(struct ixgbe_adapter *adapter)
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        struct ixgbe_ring *ring = adapter->rx_ring[i];
 
-                       if (ring->l2_accel_priv)
+                       if (!netif_is_ixgbe(ring->netdev))
                                continue;
+
                        j = ring->reg_idx;
                        vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
                        vlnctrl |= IXGBE_RXDCTL_VME;
@@ -5333,7 +5342,6 @@ static void ixgbe_disable_fwd_ring(struct ixgbe_fwd_adapter *vadapter,
        usleep_range(10000, 20000);
        ixgbe_irq_disable_queues(adapter, BIT_ULL(index));
        ixgbe_clean_rx_ring(rx_ring);
-       rx_ring->l2_accel_priv = NULL;
 }
 
 static int ixgbe_fwd_ring_down(struct net_device *vdev,
@@ -5351,10 +5359,8 @@ static int ixgbe_fwd_ring_down(struct net_device *vdev,
                adapter->rx_ring[rxbase + i]->netdev = adapter->netdev;
        }
 
-       for (i = 0; i < adapter->num_rx_queues_per_pool; i++) {
-               adapter->tx_ring[txbase + i]->l2_accel_priv = NULL;
+       for (i = 0; i < adapter->num_rx_queues_per_pool; i++)
                adapter->tx_ring[txbase + i]->netdev = adapter->netdev;
-       }
 
 
        return 0;
@@ -5384,14 +5390,11 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev,
 
        for (i = 0; i < adapter->num_rx_queues_per_pool; i++) {
                adapter->rx_ring[rxbase + i]->netdev = vdev;
-               adapter->rx_ring[rxbase + i]->l2_accel_priv = accel;
                ixgbe_configure_rx_ring(adapter, adapter->rx_ring[rxbase + i]);
        }
 
-       for (i = 0; i < adapter->num_rx_queues_per_pool; i++) {
+       for (i = 0; i < adapter->num_rx_queues_per_pool; i++)
                adapter->tx_ring[txbase + i]->netdev = vdev;
-               adapter->tx_ring[txbase + i]->l2_accel_priv = accel;
-       }
 
        queues = min_t(unsigned int,
                       adapter->num_rx_queues_per_pool, vdev->num_tx_queues);