refresh madwifi patches

[openwrt.git] / package / madwifi / patches / 352-ani_fix.patch

diff --git a/package/madwifi/patches/352-ani_fix.patch b/package/madwifi/patches/352-ani_fix.patch
index ac1c3fe..5f631d7 100644 (file)
--- a/package/madwifi/patches/352-ani_fix.patch
+++ b/package/madwifi/patches/352-ani_fix.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-06-13 03:42:29.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-06-13 03:46:33.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1014,9 +1014,7 @@
         */
        sc->sc_hasveol = ath_hal_hasveol(ah);
@@ -25,7 +23,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        return 0;
  bad3:
        ieee80211_ifdetach(ic);
-@@ -2347,16 +2350,6 @@
+@@ -2351,16 +2354,6 @@
                }
                if (status & HAL_INT_MIB) {
                        sc->sc_stats.ast_mib++;
@@ -42,7 +40,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        /* Let the HAL handle the event. */
                        ath_hal_mibevent(ah, &sc->sc_halstats);
                }
-@@ -2426,6 +2419,43 @@
+@@ -2430,6 +2423,43 @@
        return flags;
  }
  
@@ -86,7 +84,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  /*
   * Context: process context
   */
-@@ -2491,8 +2521,7 @@
+@@ -2495,8 +2525,7 @@
        if (sc->sc_softled)
                ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
  
@@ -96,16 +94,16 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
        /*
         * This is needed only to setup initial state
-@@ -2528,7 +2557,7 @@
+@@ -2532,7 +2561,7 @@
         * Enable MIB interrupts when there are hardware phy counters.
         * Note we only do this (at the moment) for station mode.
         */
--      if (sc->sc_needmib)
+-      if (sc->sc_needmib && ic->ic_opmode == IEEE80211_M_STA)
 +      if (sc->sc_needmib && ath_hal_getintmit(ah, NULL))
                sc->sc_imask |= HAL_INT_MIB;
        ath_hal_intrset(ah, sc->sc_imask);
  
-@@ -2785,9 +2814,7 @@
+@@ -2789,9 +2818,7 @@
                EPRINTF(sc, "Unable to reset hardware: '%s' (HAL status %u)\n",
                        ath_get_hal_status_desc(status), status);
  
@@ -116,7 +114,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        ath_update_txpow(sc);           /* update tx power state */
        ath_radar_update(sc);
        ath_setdefantenna(sc, sc->sc_defant);
-@@ -4165,6 +4192,8 @@
+@@ -4176,6 +4203,8 @@
        if (sc->sc_nmonvaps > 0)
                rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
                          HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
@@ -125,7 +123,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (sc->sc_curchan.privFlags & CHANNEL_DFS)
                rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
        return rfilt;
-@@ -6513,9 +6542,6 @@
+@@ -6526,9 +6555,6 @@
                        rs->rs_rssi = 0;
  
                len = rs->rs_datalen;
@@ -135,7 +133,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  
                if (rs->rs_more) {
                        /*
-@@ -8865,9 +8891,7 @@
+@@ -8880,9 +8906,7 @@
                if (sc->sc_softled)
                        ath_hal_gpioCfgOutput(ah, sc->sc_ledpin);
  
@@ -146,7 +144,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                sc->sc_curchan = hchan;
                ath_update_txpow(sc);           /* update tx power state */
                ath_radar_update(sc);
-@@ -10644,9 +10668,54 @@
+@@ -10659,9 +10683,54 @@
        ATH_RP_IGNORED          = 24,
        ATH_RADAR_IGNORED       = 25,
        ATH_MAXVAPS             = 26,
@@ -201,7 +199,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
  {
        struct ath_softc *sc = ctl->extra1;
-@@ -10832,6 +10901,11 @@
+@@ -10847,6 +10916,11 @@
                        case ATH_RADAR_IGNORED:
                                sc->sc_radar_ignored = val;
                                break;
@@ -213,7 +211,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                        default:
                                ret = -EINVAL;
                                break;
-@@ -10898,6 +10972,11 @@
+@@ -10913,6 +10987,11 @@
                case ATH_RADAR_IGNORED:
                        val = sc->sc_radar_ignored;
                        break;
@@ -225,7 +223,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
                default:
                        ret = -EINVAL;
                        break;
-@@ -11075,6 +11154,24 @@
+@@ -11090,6 +11169,24 @@
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_RADAR_IGNORED,
        },
@@ -250,25 +248,21 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        { 0 }
  };
  
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h   2008-06-13 03:42:28.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_athvar.h        2008-06-13 03:42:29.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -693,6 +693,10 @@
        unsigned int sc_txcont_power; /* Continuous transmit power in 0.5dBm units */
        unsigned int sc_txcont_rate;  /* Continuous transmit rate in Mbps */
  
 +      int8_t sc_intmit; /* Interference mitigation enabled, -1 = auto, based on mode, 0/1 = off/on */
-+      int8_t sc_noise_immunity; /* Noise immunity level, 1-5, -1 == auto) */
++      int8_t sc_noise_immunity; /* Noise immunity level, 0-4, -1 == auto) */
 +      int8_t sc_ofdm_weak_det; /* OFDM weak frames detection, -1 == auto */
 +
        /* rate tables */
        const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX];
        const HAL_RATE_TABLE *sc_currates;      /* current rate table */
-Index: madwifi-trunk-r3314/ath/if_ath_hal.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath_hal.h  2008-06-13 03:42:27.000000000 +0200
-+++ madwifi-trunk-r3314/ath/if_ath_hal.h       2008-06-13 03:45:35.000000000 +0200
+--- a/ath/if_ath_hal.h
++++ b/ath/if_ath_hal.h
 @@ -67,14 +67,14 @@
  
  static inline HAL_BOOL ath_hal_getdiagstate(struct ath_hal *ah, int request,