Ticket #705: ani_sensitivity_fix_v2.diff

ath/if_athvar.h

@@ -1035 +1035 @@
-        ath_hal_getcapability(_ah, HAL_CAP_INTMIT, 1, _dst)
-#define ath_hal_setintmit(_ah, _v) \
-        ath_hal_setcapability(ah, HAL_CAP_INTMIT, 1, _v, NULL)
+#define ath_hal_setintmitofdmweaksignaldetection(_ah, _v) \
+        ath_hal_setcapability(ah, HAL_CAP_INTMIT, 3, _v, NULL)
-
-#endif /* _DEV_ATH_ATHVAR_H */

ath/if_ath.c

@@ -1993 +1993 @@
-         */
-        ath_chan_change(sc, ic->ic_curchan);
-        ath_set_ack_bitrate(sc, sc->sc_ackrate);
+        
+        /* Fix Interference Mitigation state when turned on. The HAL seems to
+         * forget to initialise the OFDM weak signal detection parameter.
+         */
+        if (sc->sc_hasintmit && sc->sc_useintmit) {
+                DPRINTF(sc, ATH_DEBUG_RESET,
+                        "%s: correcting interference mitigation (ANI)\n", __func__);
+                ath_hal_setintmitofdmweaksignaldetection(ah, 1);
+        }
+
-        dev->flags |= IFF_RUNNING;              /* we are ready to go */
-        ieee80211_start_running(ic);            /* start all VAPs */
-#ifdef ATH_TX99_DIAG
@@ -2225 +2235 @@
-                ath_beacon_config(sc, NULL);    /* restart beacons */
-        ath_hal_intrset(ah, sc->sc_imask);
-        ath_set_ack_bitrate(sc, sc->sc_ackrate);
+
+        /* Fix Interference Mitigation state when turned on. The HAL seems to
+         * forget to initialise the OFDM weak signal detection parameter.
+         */
+        if (sc->sc_hasintmit && sc->sc_useintmit) {
+                DPRINTF(sc, ATH_DEBUG_RESET,
+                        "%s: correcting interference mitigation (ANI)\n", __func__);
+                ath_hal_setintmitofdmweaksignaldetection(ah, 1);
+        }
+
-        netif_wake_queue(dev);          /* restart xmit */
-#ifdef ATH_SUPERG_XR
-        /*
@@ -7918 +7938 @@
-                if (sc->sc_beacons && tswitch) 
-                        ath_beacon_config(sc, NULL);    
-
+                /* Fix Interference Mitigation state when turned on. The HAL seems to
+                 * forget to initialise the OFDM weak signal detection parameter.
+                 */
+                if (sc->sc_hasintmit && sc->sc_useintmit) {
+                        DPRINTF(sc, ATH_DEBUG_RESET,
+                                "%s: correcting interference mitigation (ANI)\n", __func__);
+                        ath_hal_setintmitofdmweaksignaldetection(ah, 1);
+                }
+        
-                /*
-                 * Re-enable interrupts.
-                 */