aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-03-20 11:18:55 -0700
committerDavid S. Miller <davem@davemloft.net>2019-03-20 11:18:55 -0700
commit75d317c40964c50e476df3f86de6fed135048cd2 (patch)
tree606fd11e76d457dbcfcb197f573808cb625bee3f /drivers/net/tun.c
parentMerge branch 'qed-next' (diff)
parentnet: remove 'fallback' argument from dev->ndo_select_queue() (diff)
downloadlinux-dev-75d317c40964c50e476df3f86de6fed135048cd2.tar.xz
linux-dev-75d317c40964c50e476df3f86de6fed135048cd2.zip
Merge branch 'net-refactor-ndo_select_queue'
Paolo Abeni says: ==================== net: refactor ndo_select_queue() Currently, on most devices implementing ndo_select_queue(), we get 2 indirect calls per xmit packet, at least in some scenarios. We can avoid one of such indirect calls refactoring the ndo_select_queue() usage so that we don't need anymore the 'fallback' argument. The first patch renames a helper used later as a public API, the second one changes the af packet implementation so that it uses the common infrastructure to select the xmit queue, and the second patch drops the now unneeded argument from ndo_select_queue(). Alternatively we could use the INDIRECT_CALL_WRAPPER infrastructure to avoid the fallback indirect call in the common case, but this solution allows also for some code cleanup. v1 -> v2: - renamed select queue helpers, as per Eric's and David's suggestions ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e9ca1c088d0b..ef3b65514976 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -606,8 +606,7 @@ static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb)
}
static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,
- struct net_device *sb_dev,
- select_queue_fallback_t fallback)
+ struct net_device *sb_dev)
{
struct tun_struct *tun = netdev_priv(dev);
u16 ret;