diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-16 22:02:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-16 22:02:14 -0400 |
| commit | 7a7c1705dc6c629e3b1dce1c0c1ecc0af87486ac (patch) | |
| tree | f775ce9ddb09834f73df9d7354c744bddcde4758 | |
| parent | 89764d59d237480ad930866dcf248b5e930454b9 (diff) | |
| parent | 4272cc51a6dcf2c086863372fd593809ffced7d5 (diff) | |
| download | lwn-7a7c1705dc6c629e3b1dce1c0c1ecc0af87486ac.tar.gz lwn-7a7c1705dc6c629e3b1dce1c0c1ecc0af87486ac.zip | |
Merge branch 'IFF_NO_QUEUE-followups'
Phil Sutter says:
====================
Minor IFF_NO_QUEUE conversion follow-up
The following series converts two further drivers away from setting
'tx_queue_len = 0' to adding IFF_NO_QUEUE to priv_flags instead.
The first one, rtl8188eu in staging didn't exist back when all drivers
were converted. The second one, openvswitch seems to have slipped through
my grep'ing back then, no idea why.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/mon.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/vport-internal_dev.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c index 63bb87593af0..d976e5e18d50 100644 --- a/drivers/staging/rtl8188eu/os_dep/mon.c +++ b/drivers/staging/rtl8188eu/os_dep/mon.c @@ -155,7 +155,7 @@ static void mon_setup(struct net_device *dev) dev->netdev_ops = &mon_netdev_ops; dev->destructor = free_netdev; ether_setup(dev); - dev->tx_queue_len = 0; + dev->priv_flags |= IFF_NO_QUEUE; dev->type = ARPHRD_IEEE80211; /* * Use a locally administered address (IEEE 802) diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 7c8b90bf0e54..2ee48e447b72 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -165,11 +165,10 @@ static void do_setup(struct net_device *netdev) netdev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_OPENVSWITCH | - IFF_PHONY_HEADROOM; + IFF_PHONY_HEADROOM | IFF_NO_QUEUE; netdev->destructor = internal_dev_destructor; netdev->ethtool_ops = &internal_dev_ethtool_ops; netdev->rtnl_link_ops = &internal_dev_link_ops; - netdev->tx_queue_len = 0; netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | |