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 /net/dsa | |
| parent | 0b233dc7167884f95f08e796ac6a6767ae7d0d70 (diff) | |
| parent | 348e3435cbefa815bd56a5205c1412b5afe7b92e (diff) | |
| download | linux-61ed713bbb043f333ca9576c79a3d33d2ad17438.tar.bz2 | |
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/dsa')
| -rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 373ff315030d..cce97385f743 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1147,7 +1147,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent, slave_dev->features = master->vlan_features; slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; eth_hw_addr_inherit(slave_dev, master); - slave_dev->tx_queue_len = 0; + slave_dev->priv_flags |= IFF_NO_QUEUE; slave_dev->netdev_ops = &dsa_slave_netdev_ops; slave_dev->switchdev_ops = &dsa_slave_switchdev_ops; |