summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-03-27 15:34:59 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-03-28 20:49:47 (GMT)
commitb7d47ca2fdfd3b613b800c923553a8437dd8da40 (patch)
tree14d43c58480c1dd36ec622d28248a4f369317320 /drivers
parent63ea7dce8ce6de8d9d6b36b835219b38655b13e8 (diff)
downloadlinux-b7d47ca2fdfd3b613b800c923553a8437dd8da40.tar.xz
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>
Diffstat (limited to 'drivers')
-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 6929b03..34924df 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,