diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1a76b4fe9b97..357111431ec9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3689,16 +3689,14 @@ get_cpus_map: | |||
3689 | } | 3689 | } |
3690 | 3690 | ||
3691 | u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb, | 3691 | u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb, |
3692 | struct net_device *sb_dev, | 3692 | struct net_device *sb_dev) |
3693 | select_queue_fallback_t fallback) | ||
3694 | { | 3693 | { |
3695 | return 0; | 3694 | return 0; |
3696 | } | 3695 | } |
3697 | EXPORT_SYMBOL(dev_pick_tx_zero); | 3696 | EXPORT_SYMBOL(dev_pick_tx_zero); |
3698 | 3697 | ||
3699 | u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb, | 3698 | u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb, |
3700 | struct net_device *sb_dev, | 3699 | struct net_device *sb_dev) |
3701 | select_queue_fallback_t fallback) | ||
3702 | { | 3700 | { |
3703 | return (u16)raw_smp_processor_id() % dev->real_num_tx_queues; | 3701 | return (u16)raw_smp_processor_id() % dev->real_num_tx_queues; |
3704 | } | 3702 | } |
@@ -3748,8 +3746,7 @@ struct netdev_queue *netdev_core_pick_tx(struct net_device *dev, | |||
3748 | const struct net_device_ops *ops = dev->netdev_ops; | 3746 | const struct net_device_ops *ops = dev->netdev_ops; |
3749 | 3747 | ||
3750 | if (ops->ndo_select_queue) | 3748 | if (ops->ndo_select_queue) |
3751 | queue_index = ops->ndo_select_queue(dev, skb, sb_dev, | 3749 | queue_index = ops->ndo_select_queue(dev, skb, sb_dev); |
3752 | netdev_pick_tx); | ||
3753 | else | 3750 | else |
3754 | queue_index = netdev_pick_tx(dev, skb, sb_dev); | 3751 | queue_index = netdev_pick_tx(dev, skb, sb_dev); |
3755 | 3752 | ||