summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap/hostap_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-18 11:55:08 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-18 11:55:08 -0700
commit61ed713bbb043f333ca9576c79a3d33d2ad17438 (patch)
tree018c84769b8c270f6bec9020da36e9916985a061 /drivers/net/wireless/hostap/hostap_main.c
parent0b233dc7167884f95f08e796ac6a6767ae7d0d70 (diff)
parent348e3435cbefa815bd56a5205c1412b5afe7b92e (diff)
downloadlinux-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/wireless/hostap/hostap_main.c')
-rw-r--r--drivers/net/wireless/hostap/hostap_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 01de1a3bf94e..80d4228ba754 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -865,7 +865,7 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
switch(type) {
case HOSTAP_INTERFACE_AP:
- dev->tx_queue_len = 0; /* use main radio device queue */
+ dev->priv_flags |= IFF_NO_QUEUE; /* use main radio device queue */
dev->netdev_ops = &hostap_mgmt_netdev_ops;
dev->type = ARPHRD_IEEE80211;
dev->header_ops = &hostap_80211_ops;
@@ -874,7 +874,7 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
dev->netdev_ops = &hostap_master_ops;
break;
default:
- dev->tx_queue_len = 0; /* use main radio device queue */
+ dev->priv_flags |= IFF_NO_QUEUE; /* use main radio device queue */
dev->netdev_ops = &hostap_netdev_ops;
}