mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
net: allow fallback function to pass netdev
For most of these calls we can just pass NULL through to the fallback function as the sb_dev. The only cases where we cannot are the cases where we might be dealing with either an upper device or a driver that would have configured things to support an sb_dev itself. The only driver that has any significant change in this patch set should be ixgbe as we can drop the redundant functionality that existed in both the ndo_select_queue function and the fallback function that was passed through to us. Signed-off-by: Alexander Duyck <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
This commit is contained in:
parent
4f49dec907
commit
8ec56fc3c5
14 changed files with 24 additions and 27 deletions
|
|
@ -275,9 +275,10 @@ static bool packet_use_direct_xmit(const struct packet_sock *po)
|
|||
return po->xmit == packet_direct_xmit;
|
||||
}
|
||||
|
||||
static u16 __packet_pick_tx_queue(struct net_device *dev, struct sk_buff *skb)
|
||||
static u16 __packet_pick_tx_queue(struct net_device *dev, struct sk_buff *skb,
|
||||
struct net_device *sb_dev)
|
||||
{
|
||||
return dev_pick_tx_cpu_id(dev, skb, NULL, NULL);
|
||||
return dev_pick_tx_cpu_id(dev, skb, sb_dev, NULL);
|
||||
}
|
||||
|
||||
static u16 packet_pick_tx_queue(struct sk_buff *skb)
|
||||
|
|
@ -291,7 +292,7 @@ static u16 packet_pick_tx_queue(struct sk_buff *skb)
|
|||
__packet_pick_tx_queue);
|
||||
queue_index = netdev_cap_txqueue(dev, queue_index);
|
||||
} else {
|
||||
queue_index = __packet_pick_tx_queue(dev, skb);
|
||||
queue_index = __packet_pick_tx_queue(dev, skb, NULL);
|
||||
}
|
||||
|
||||
return queue_index;
|
||||
|
|
|
|||
Loading…
Reference in a new issue