2 files changed, 8 insertions, 21 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 80225af2acb1..abb176df2e7f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8208,20 +8208,17 @@ static void ixgbe_atr(struct ixgbe_ring *ring,
                                               input, common, ring->queue_index);
 }
 
+#ifdef IXGBE_FCOE
 static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
                               void *accel_priv, select_queue_fallback_t fallback)
 {
-        struct ixgbe_fwd_adapter *fwd_adapter = accel_priv;
-#ifdef IXGBE_FCOE
         struct ixgbe_adapter *adapter;
         struct ixgbe_ring_feature *f;
-#endif
         int txq;
 
-        if (fwd_adapter) {
-                u8 tc = netdev_get_num_tc(dev) ?
-                        netdev_get_prio_tc_map(dev, skb->priority) : 0;
-                struct net_device *vdev = fwd_adapter->netdev;
+        if (accel_priv) {
+                u8 tc = netdev_get_prio_tc_map(dev, skb->priority);
+                struct net_device *vdev = accel_priv;
 
                 txq = vdev->tc_to_txq[tc].offset;
                 txq += reciprocal_scale(skb_get_hash(skb),
@@ -8230,8 +8227,6 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
                 return txq;
         }
 
-#ifdef IXGBE_FCOE
-
         /*
          * only execute the code below if protocol is FCoE
          * or FIP and we have FCoE enabled on the adapter
@@ -8257,11 +8252,9 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb,
                 txq -= f->indices;
 
         return txq + f->offset;
-#else
-        return fallback(dev, skb);
-#endif
 }
 
+#endif
 static int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,
                                struct xdp_frame *xdpf)
 {
@@ -10058,7 +10051,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_open               = ixgbe_open,
         .ndo_stop               = ixgbe_close,
         .ndo_start_xmit         = ixgbe_xmit_frame,
-        .ndo_select_queue       = ixgbe_select_queue,
         .ndo_set_rx_mode        = ixgbe_set_rx_mode,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = ixgbe_set_mac,
@@ -10081,6 +10073,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_poll_controller    = ixgbe_netpoll,
 #endif
 #ifdef IXGBE_FCOE
+        .ndo_select_queue       = ixgbe_select_queue,
         .ndo_fcoe_ddp_setup = ixgbe_fcoe_ddp_get,
         .ndo_fcoe_ddp_target = ixgbe_fcoe_ddp_target,
         .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put,
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index adde8fc45588..401e1d1ce1ec 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -514,7 +514,6 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
         const struct macvlan_dev *vlan = netdev_priv(dev);
         const struct macvlan_port *port = vlan->port;
         const struct macvlan_dev *dest;
-        void *accel_priv = NULL;
 
         if (vlan->mode == MACVLAN_MODE_BRIDGE) {
                 const struct ethhdr *eth = (void *)skb->data;
@@ -533,15 +532,10 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
                         return NET_XMIT_SUCCESS;
                 }
         }
-
-        /* For packets that are non-multicast and not bridged we will pass
-         * the necessary information so that the lowerdev can distinguish
-         * the source of the packets via the accel_priv value.
-         */
-        accel_priv = vlan->accel_priv;
 xmit_world:
         skb->dev = vlan->lowerdev;
-        return dev_queue_xmit_accel(skb, accel_priv);
+        return dev_queue_xmit_accel(skb,
+                                    netdev_get_sb_channel(dev) ? dev : NULL);
 }
 
 static inline netdev_tx_t macvlan_netpoll_send_skb(struct macvlan_dev *vlan, struct sk_buff *skb)