diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2014-03-27 11:34:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-28 16:49:47 -0400 |
| commit | b7d47ca2fdfd3b613b800c923553a8437dd8da40 (patch) | |
| tree | 14d43c58480c1dd36ec622d28248a4f369317320 | |
| parent | 63ea7dce8ce6de8d9d6b36b835219b38655b13e8 (diff) | |
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.c | 3 |
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) | |||
| 136 | dev->ethtool_ops = &nlmon_ethtool_ops; | 136 | dev->ethtool_ops = &nlmon_ethtool_ops; |
| 137 | dev->destructor = free_netdev; | 137 | dev->destructor = free_netdev; |
| 138 | 138 | ||
| 139 | dev->features = NETIF_F_FRAGLIST | NETIF_F_HIGHDMA; | 139 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | |
| 140 | NETIF_F_HIGHDMA | NETIF_F_LLTX; | ||
| 140 | dev->flags = IFF_NOARP; | 141 | dev->flags = IFF_NOARP; |
| 141 | 142 | ||
| 142 | /* That's rather a softlimit here, which, of course, | 143 | /* That's rather a softlimit here, which, of course, |