diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-18 11:55:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-18 11:55:08 -0700 |
| commit | 61ed713bbb043f333ca9576c79a3d33d2ad17438 (patch) | |
| tree | 018c84769b8c270f6bec9020da36e9916985a061 /drivers/net/vxlan.c | |
| parent | 0b233dc7167884f95f08e796ac6a6767ae7d0d70 (diff) | |
| parent | 348e3435cbefa815bd56a5205c1412b5afe7b92e (diff) | |
| download | linux-61ed713bbb043f333ca9576c79a3d33d2ad17438.tar.gz linux-61ed713bbb043f333ca9576c79a3d33d2ad17438.tar.bz2 linux-61ed713bbb043f333ca9576c79a3d33d2ad17438.zip | |
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 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 06c0731ae619..ad51dac88d19 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2416,7 +2416,6 @@ static void vxlan_setup(struct net_device *dev) dev->destructor = free_netdev; SET_NETDEV_DEVTYPE(dev, &vxlan_type); - dev->tx_queue_len = 0; dev->features |= NETIF_F_LLTX; dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; dev->features |= NETIF_F_RXCSUM; @@ -2428,7 +2427,7 @@ static void vxlan_setup(struct net_device *dev) dev->hw_features |= NETIF_F_GSO_SOFTWARE; dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; netif_keep_dst(dev); - dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; + dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE; INIT_LIST_HEAD(&vxlan->next); spin_lock_init(&vxlan->hash_lock); |