diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-04-29 22:01:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-29 22:01:33 -0400 |
| commit | c1b28847f7c00906a765516e8291ea2a71add64b (patch) | |
| tree | 79b017d20c0cc9ad084b4834ae026288b7dd9e1e /include/linux | |
| parent | Merge branch 'lan78xx-fixed-phy' (diff) | |
| parent | net: Revoke export for __skb_tx_hash, update it to just be static skb_tx_hash (diff) | |
| download | linux-dev-c1b28847f7c00906a765516e8291ea2a71add64b.tar.xz linux-dev-c1b28847f7c00906a765516e8291ea2a71add64b.zip | |
Merge branch 'net-cleanup-skb_tx_hash'
Alexander Duyck says:
====================
Clean up users of skb_tx_hash and __skb_tx_hash
I am in the process of doing some work to try and enable macvlan Tx queue
selection without using ndo_select_queue. As a part of that I will likely
need to make changes to skb_tx_hash. As such this is a clean up or refactor
of the two spots where he function has been used. In both cases it didn't
really seem like the function was being used correctly so I have updated
both code paths to not make use of the function.
My current development environment doesn't have an mlx4 or OPA vnic
available so the changes to those have been build tested only.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 366c32891158..82f5a9aba578 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3213,19 +3213,6 @@ static inline int netif_set_xps_queue(struct net_device *dev, } #endif -u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb, - unsigned int num_tx_queues); - -/* - * Returns a Tx hash for the given packet when dev->real_num_tx_queues is used - * as a distribution range limit for the returned value. - */ -static inline u16 skb_tx_hash(const struct net_device *dev, - struct sk_buff *skb) -{ - return __skb_tx_hash(dev, skb, dev->real_num_tx_queues); -} - /** * netif_is_multiqueue - test if device has multiple transmit queues * @dev: network device |