OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22dba39
)
net: 8021q: convert to using IFF_NO_QUEUE
author
Phil Sutter
<phil@nwl.cc>
Tue, 18 Aug 2015 08:30:36 +0000
(10:30 +0200)
committer
David S. Miller
<davem@davemloft.net>
Tue, 18 Aug 2015 18:55:06 +0000
(11:55 -0700)
Signed-off-by: Phil Sutter <phil@nwl.cc>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/8021q/vlan_dev.c
patch
|
blob
|
history
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index
01d7ba8
..
fded865
100644
(file)
--- a/
net/8021q/vlan_dev.c
+++ b/
net/8021q/vlan_dev.c
@@
-791,10
+791,9
@@
void vlan_setup(struct net_device *dev)
{
ether_setup(dev);
- dev->priv_flags |= IFF_802_1Q_VLAN;
+ dev->priv_flags |= IFF_802_1Q_VLAN
| IFF_NO_QUEUE
;
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
netif_keep_dst(dev);
- dev->tx_queue_len = 0;
dev->netdev_ops = &vlan_netdev_ops;
dev->destructor = vlan_dev_free;