diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-18 21:55:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-18 21:55:08 +0300 |
| commit | 61ed713bbb043f333ca9576c79a3d33d2ad17438 (patch) | |
| tree | 018c84769b8c270f6bec9020da36e9916985a061 /net/8021q/vlan_dev.c | |
| parent | 0b233dc7167884f95f08e796ac6a6767ae7d0d70 (diff) | |
| parent | 348e3435cbefa815bd56a5205c1412b5afe7b92e (diff) | |
| download | linux-61ed713bbb043f333ca9576c79a3d33d2ad17438.tar.xz | |
Merge branch 'drivers_iff_no_queue'
Phil Sutter says:
====================
net: Convert drivers to IFF_NO_QUEUE and cleanup afterwards
This series converts in-tree users away from the old and deprecated
'tx_queue_len = 0' idiom, adds a warning to notify out-of-tree driver
maintainers that there is need for action on their behalf and finally drops any
workarounds in scheduling algorithm implementations.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 01d7ba840df8..fded86508117 100644 --- 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; |