wlan: 802.11 devices and vap is not ready for ALTQ packet schedulers
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Fri, 7 Jun 2013 08:01:06 +0000 (16:01 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Fri, 7 Jun 2013 08:01:06 +0000 (16:01 +0800)
Current power saving queue inject and send queue flush code do not
work with ALTQ packet schedulers.

15 files changed:
sys/dev/netif/acx/if_acx.c
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/bwi/if_bwi.c
sys/dev/netif/iwi/if_iwi.c
sys/dev/netif/iwl/iwl2100.c
sys/dev/netif/iwn/if_iwn.c
sys/dev/netif/ndis/if_ndis.c
sys/dev/netif/ral/rt2560.c
sys/dev/netif/ral/rt2661.c
sys/dev/netif/rtw/rtw.c
sys/dev/netif/rum/if_rum.c
sys/dev/netif/ural/if_ural.c
sys/dev/netif/wi/if_wi.c
sys/dev/netif/wpi/if_wpi.c
sys/netproto/802_11/wlan/ieee80211.c

index eec548c..3d0e25e 100644 (file)
@@ -485,7 +485,9 @@ acx_attach(device_t dev)
        ifp->if_watchdog = acx_watchdog;
        ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        /* Set channels */
        for (i = 1; i <= 14; ++i) {
index 570a737..8aa23fe 100644 (file)
@@ -570,7 +570,9 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
        ifp->if_ioctl = ath_ioctl;
        ifp->if_init = ath_init;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_ifp = ifp;
        /* XXX not right but it's not used anywhere important */
index 172fe03..a21cd31 100644 (file)
@@ -714,7 +714,9 @@ bwi_attach(device_t dev)
        ifp->if_start = bwi_start;
        ifp->if_watchdog = bwi_watchdog;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        /* Get locale */
        sc->sc_locale = __SHIFTOUT(bwi_read_sprom(sc, BWI_SPROM_CARD_INFO),
index ab1283f..a35777a 100644 (file)
@@ -368,7 +368,9 @@ iwi_attach(device_t dev)
        ifp->if_ioctl = iwi_ioctl;
        ifp->if_start = iwi_start;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_ifp = ifp;
        ic->ic_opmode = IEEE80211_M_STA;
index 0c555b6..ce64d3a 100644 (file)
@@ -237,7 +237,9 @@ iwl2100_attach(device_t dev)
        ifp->if_start = iwl2100_start;
        ifp->if_watchdog = iwl2100_watchdog;
        ifq_set_maxlen(&ifp->if_snd, IWL2100_TX_USED_MAX);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
 #ifdef DUMP_EEPROM
        device_printf(dev, "eeprom\n");
index dd77123..08e296b 100644 (file)
@@ -661,7 +661,9 @@ iwn_pci_attach(device_t dev)
        ifp->if_ioctl = iwn_ioctl;
        ifp->if_start = iwn_start;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ieee80211_ifattach(ic, macaddr);
        ic->ic_vap_create = iwn_vap_create;
index 42c910a..f7d7018 100644 (file)
@@ -744,10 +744,9 @@ ndis_attach(device_t dev)
        ifp->if_init = ndis_init;
        ifp->if_baudrate = 10000000;
        ifq_set_maxlen(&ifp->if_snd, 50);
-#if 0 /* XXX swildner */
-       ifp->if_snd.ifq_drv_maxlen = 25;
-#endif
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
        ifp->if_capenable = ifp->if_capabilities;
        ifp->if_hwassist = sc->ndis_hwassist;
 
index 74d4008..3310b93 100644 (file)
@@ -265,7 +265,9 @@ rt2560_attach(device_t dev, int id)
        ifp->if_ioctl = rt2560_ioctl;
        ifp->if_start = rt2560_start;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_ifp = ifp;
        ic->ic_opmode = IEEE80211_M_STA;
index 15c62b5..d39ef98 100644 (file)
@@ -267,7 +267,9 @@ rt2661_attach(device_t dev, int id)
        ifp->if_ioctl = rt2661_ioctl;
        ifp->if_start = rt2661_start;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_ifp = ifp;
        ic->ic_opmode = IEEE80211_M_STA;
index d295f02..6e12f55 100644 (file)
@@ -3857,7 +3857,9 @@ rtw_attach(device_t dev)
        ifp->if_start = rtw_start;
        ifp->if_watchdog = rtw_watchdog;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_phytype = IEEE80211_T_DS;
        ic->ic_opmode = IEEE80211_M_STA;
index 5872693..4b92338 100644 (file)
@@ -407,7 +407,9 @@ rum_attach(device_t self)
        ifp->if_start = rum_start;
        ifp->if_watchdog = rum_watchdog;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        IEEE80211_ONOE_PARAM_SETUP(&sc->sc_onoe_param);
        sc->sc_onoe_param.onoe_raise = 15;
index bc53045..98019eb 100644 (file)
@@ -453,7 +453,9 @@ ural_attach(device_t self)
        ifp->if_start = ural_start;
        ifp->if_watchdog = ural_watchdog;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        IEEE80211_ONOE_PARAM_SETUP(&sc->sc_onoe_param);
        sc->sc_onoe_param.onoe_raise = 20;
index 017472b..00e9ea4 100644 (file)
@@ -340,7 +340,9 @@ wi_attach(device_t dev)
        ifp->if_start = wi_start;
        ifp->if_init = wi_init;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ic->ic_ifp = ifp;
        ic->ic_phytype = IEEE80211_T_DS;
index 05f2585..56d356a 100644 (file)
@@ -669,7 +669,9 @@ wpi_attach(device_t dev)
        ifp->if_ioctl = wpi_ioctl;
        ifp->if_start = wpi_start;
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
+#endif
 
        ieee80211_ifattach(ic, macaddr);
        /* override default methods */
index bf5fef7..06d6397 100644 (file)
@@ -398,7 +398,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap,
        ifp->if_init = ieee80211_init;
        /* NB: input+output filled in by ether_ifattach */
        ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
-#if 0
+#ifdef notyet
        ifq_set_ready(&ifp->if_snd);
 #endif