summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-03-27 16:34:59 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-28 16:49:47 -0400
commitb7d47ca2fdfd3b613b800c923553a8437dd8da40 (patch)
tree14d43c58480c1dd36ec622d28248a4f369317320
parent63ea7dce8ce6de8d9d6b36b835219b38655b13e8 (diff)
downloadlinux-b7d47ca2fdfd3b613b800c923553a8437dd8da40.tar.gz
linux-b7d47ca2fdfd3b613b800c923553a8437dd8da40.tar.bz2
linux-b7d47ca2fdfd3b613b800c923553a8437dd8da40.zip
net: nlmon: flag nlmon devs with LLTX/SG
As in xmit path we merely update statistics and free the skb, we can mark the device with LLTX feature, so that upper layers can avoid taking the single txq lock on xmit. While at it, also add missing NETIF_F_SG. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/nlmon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
index 6929b03ec638..34924dfadd00 100644
--- a/drivers/net/nlmon.c
+++ b/drivers/net/nlmon.c
@@ -136,7 +136,8 @@ static void nlmon_setup(struct net_device *dev)
dev->ethtool_ops = &nlmon_ethtool_ops;
dev->destructor = free_netdev;
- dev->features = NETIF_F_FRAGLIST | NETIF_F_HIGHDMA;
+ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
+ NETIF_F_HIGHDMA | NETIF_F_LLTX;
dev->flags = IFF_NOARP;
/* That's rather a softlimit here, which, of course,