diff options
| author | Phil Sutter <phil@nwl.cc> | 2015-08-18 10:30:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-18 20:55:06 +0200 |
| commit | 1e6f20ca6c90d06d8d7654009aa99f0eec76ea65 (patch) | |
| tree | 5f4c2844162d482410aab59d56d85a5cc56adf19 /drivers/net/bonding | |
| parent | net: 6lowpan: convert to using IFF_NO_QUEUE (diff) | |
| download | linux-1e6f20ca6c90d06d8d7654009aa99f0eec76ea65.tar.xz linux-1e6f20ca6c90d06d8d7654009aa99f0eec76ea65.zip | |
net: bonding: convert to using IFF_NO_QUEUE
Signed-off-by: Phil Sutter <phil@nwl.cc>
Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2d7d72c88519..0ef2ed3a610e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4120,9 +4120,8 @@ void bond_setup(struct net_device *bond_dev) SET_NETDEV_DEVTYPE(bond_dev, &bond_type); /* Initialize the device options */ - bond_dev->tx_queue_len = 0; bond_dev->flags |= IFF_MASTER|IFF_MULTICAST; - bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT; + bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE; bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); /* don't acquire bond device's netif_tx_lock when transmitting */ |