aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-16 22:02:14 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-16 22:02:14 -0400
commit7a7c1705dc6c629e3b1dce1c0c1ecc0af87486ac (patch)
treef775ce9ddb09834f73df9d7354c744bddcde4758
parent89764d59d237480ad930866dcf248b5e930454b9 (diff)
parent4272cc51a6dcf2c086863372fd593809ffced7d5 (diff)
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.c2
-rw-r--r--net/openvswitch/vport-internal_dev.c3
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)
155 dev->netdev_ops = &mon_netdev_ops; 155 dev->netdev_ops = &mon_netdev_ops;
156 dev->destructor = free_netdev; 156 dev->destructor = free_netdev;
157 ether_setup(dev); 157 ether_setup(dev);
158 dev->tx_queue_len = 0; 158 dev->priv_flags |= IFF_NO_QUEUE;
159 dev->type = ARPHRD_IEEE80211; 159 dev->type = ARPHRD_IEEE80211;
160 /* 160 /*
161 * Use a locally administered address (IEEE 802) 161 * 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)
165 165
166 netdev->priv_flags &= ~IFF_TX_SKB_SHARING; 166 netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
167 netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_OPENVSWITCH | 167 netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_OPENVSWITCH |
168 IFF_PHONY_HEADROOM; 168 IFF_PHONY_HEADROOM | IFF_NO_QUEUE;
169 netdev->destructor = internal_dev_destructor; 169 netdev->destructor = internal_dev_destructor;
170 netdev->ethtool_ops = &internal_dev_ethtool_ops; 170 netdev->ethtool_ops = &internal_dev_ethtool_ops;
171 netdev->rtnl_link_ops = &internal_dev_link_ops; 171 netdev->rtnl_link_ops = &internal_dev_link_ops;
172 netdev->tx_queue_len = 0;
173 172
174 netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST | 173 netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
175 NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | 174 NETIF_F_HIGHDMA | NETIF_F_HW_CSUM |