net: Add generic ndo_select_queue functions

This patch adds a generic version of the ndo_select_queue functions for
either returning 0 or selecting a queue based on the processor ID. This is
generally meant to just reduce the number of functions we have to change
in the future when we have to deal with ndo_select_queue changes.

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>

3 files changed, 3 insertions, 25 deletions

diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index afc810069440..7a637b51c7d2 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -563,14 +563,6 @@ ltq_etop_set_multicast_list(struct net_device *dev)
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-static u16
-ltq_etop_select_queue(struct net_device *dev, struct sk_buff *skb,
-                      void *accel_priv, select_queue_fallback_t fallback)
-{
-        /* we are currently only using the first queue */
-        return 0;
-}
-
 static int
 ltq_etop_init(struct net_device *dev)
 {
@@ -641,7 +633,7 @@ static const struct net_device_ops ltq_eth_netdev_ops = {
         .ndo_set_mac_address = ltq_etop_set_mac_address,
         .ndo_validate_addr = eth_validate_addr,
         .ndo_set_rx_mode = ltq_etop_set_multicast_list,
-        .ndo_select_queue = ltq_etop_select_queue,
+        .ndo_select_queue = dev_pick_tx_zero,
         .ndo_init = ltq_etop_init,
         .ndo_tx_timeout = ltq_etop_tx_timeout,
 };
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 6ebf110cd594..a1d335a3c5e4 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1889,13 +1889,6 @@ static int netcp_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
         return err;
 }
 
-static u16 netcp_select_queue(struct net_device *dev, struct sk_buff *skb,
-                              void *accel_priv,
-                              select_queue_fallback_t fallback)
-{
-        return 0;
-}
-
 static int netcp_setup_tc(struct net_device *dev, enum tc_setup_type type,
                           void *type_data)
 {
@@ -1972,7 +1965,7 @@ static const struct net_device_ops netcp_netdev_ops = {
         .ndo_vlan_rx_add_vid    = netcp_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = netcp_rx_kill_vid,
         .ndo_tx_timeout         = netcp_ndo_tx_timeout,
-        .ndo_select_queue       = netcp_select_queue,
+        .ndo_select_queue       = dev_pick_tx_zero,
         .ndo_setup_tc           = netcp_setup_tc,
 };
 
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index e461168313bf..4e6611e4c59b 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -290,13 +290,6 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
-static u16 xlr_net_select_queue(struct net_device *ndev, struct sk_buff *skb,
-                                void *accel_priv,
-                                select_queue_fallback_t fallback)
-{
-        return (u16)smp_processor_id();
-}
-
 static void xlr_hw_set_mac_addr(struct net_device *ndev)
 {
         struct xlr_net_priv *priv = netdev_priv(ndev);
@@ -403,7 +396,7 @@ static const struct net_device_ops xlr_netdev_ops = {
         .ndo_open = xlr_net_open,
         .ndo_stop = xlr_net_stop,
         .ndo_start_xmit = xlr_net_start_xmit,
-        .ndo_select_queue = xlr_net_select_queue,
+        .ndo_select_queue = dev_pick_tx_cpu_id,
         .ndo_set_mac_address = xlr_net_set_mac_addr,
         .ndo_set_rx_mode = xlr_set_rx_mode,
         .ndo_get_stats64 = xlr_stats,