4 files changed, 14 insertions, 14 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 26f69cf763f4..57cd2bdd9f78 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2152,9 +2152,9 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
                                   &qdisc_xmit_lock_key);        \
 }
 
-struct netdev_queue *netdev_pick_tx(struct net_device *dev,
-                                    struct sk_buff *skb,
-                                    struct net_device *sb_dev);
+struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,
+                                         struct sk_buff *skb,
+                                         struct net_device *sb_dev);
 
 /* returns the headroom that the master device needs to take in account
  * when forwarding to this dev
diff --git a/net/core/dev.c b/net/core/dev.c
index 2b67f2aa59dd..5dd3e3f7dd12 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3704,8 +3704,8 @@ u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,
 }
 EXPORT_SYMBOL(dev_pick_tx_cpu_id);
 
-static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
-                            struct net_device *sb_dev)
+static u16 netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
+                          struct net_device *sb_dev)
 {
         struct sock *sk = skb->sk;
         int queue_index = sk_tx_queue_get(sk);
@@ -3730,9 +3730,9 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
         return queue_index;
 }
 
-struct netdev_queue *netdev_pick_tx(struct net_device *dev,
-                                    struct sk_buff *skb,
-                                    struct net_device *sb_dev)
+struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,
+                                         struct sk_buff *skb,
+                                         struct net_device *sb_dev)
 {
         int queue_index = 0;
 
@@ -3748,9 +3748,9 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,
 
                 if (ops->ndo_select_queue)
                         queue_index = ops->ndo_select_queue(dev, skb, sb_dev,
-                                                            __netdev_pick_tx);
+                                                            netdev_pick_tx);
                 else
-                        queue_index = __netdev_pick_tx(dev, skb, sb_dev);
+                        queue_index = netdev_pick_tx(dev, skb, sb_dev);
 
                 queue_index = netdev_cap_txqueue(dev, queue_index);
         }
@@ -3824,7 +3824,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)
         else
                 skb_dst_force(skb);
 
-        txq = netdev_pick_tx(dev, skb, sb_dev);
+        txq = netdev_core_pick_tx(dev, skb, sb_dev);
         q = rcu_dereference_bh(txq->qdisc);
 
         trace_net_dev_queue(skb);
@@ -4429,7 +4429,7 @@ void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)
         bool free_skb = true;
         int cpu, rc;
 
-        txq = netdev_pick_tx(dev, skb, NULL);
+        txq = netdev_core_pick_tx(dev, skb, NULL);
         cpu = smp_processor_id();
         HARD_TX_LOCK(dev, txq, cpu);
         if (!netif_xmit_stopped(txq)) {
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 361aabffb8c0..e365e8fb1c40 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -323,7 +323,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
         if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
                 struct netdev_queue *txq;
 
-                txq = netdev_pick_tx(dev, skb, NULL);
+                txq = netdev_core_pick_tx(dev, skb, NULL);
 
                 /* try until next clock tick */
                 for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index b8736f56e7f7..2db1626557c5 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -247,7 +247,7 @@ void xfrm_dev_resume(struct sk_buff *skb)
         unsigned long flags;
 
         rcu_read_lock();
-        txq = netdev_pick_tx(dev, skb, NULL);
+        txq = netdev_core_pick_tx(dev, skb, NULL);
 
         HARD_TX_LOCK(dev, txq, smp_processor_id());
         if (!netif_xmit_frozen_or_stopped(txq))