Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / drivers / net / wireless / hostap / hostap_main.c

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 6fe122f18c0dcd68f8de72db16cc3310338aaf2b..eb57d1ea361f73738ee22451e29e6b799a82db81 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -875,15 +875,16 @@ 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->netdev_ops = &hostap_mgmt_netdev_ops;
                dev->type = ARPHRD_IEEE80211;
                dev->header_ops = &hostap_80211_ops;
                break;
        case HOSTAP_INTERFACE_MASTER:
-               dev->tx_queue_len = 0;  /* use main radio device queue */
                dev->netdev_ops = &hostap_master_ops;
                break;
        default:
+               dev->tx_queue_len = 0;  /* use main radio device queue */
                dev->netdev_ops = &hostap_netdev_ops;
        }