brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / patches / 366-bstuck_thresh.patch

diff --git a/package/madwifi/patches/366-bstuck_thresh.patch b/package/madwifi/patches/366-bstuck_thresh.patch
index ecf5dc9..cde1f5c 100644 (file)
--- a/package/madwifi/patches/366-bstuck_thresh.patch
+++ b/package/madwifi/patches/366-bstuck_thresh.patch
@@ -1,6 +1,6 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c

-@@ -389,6 +389,7 @@
+@@ -389,6 +389,7 @@ static int ath_countrycode = CTRY_DEFAUL

  static int ath_outdoor = AH_FALSE;            /* enable outdoor use */
  static int ath_xchanmode = AH_TRUE;           /* enable extended channels */
  static int ath_maxvaps = ATH_MAXVAPS_DEFAULT;   /* set default maximum vaps */
  static int ath_outdoor = AH_FALSE;            /* enable outdoor use */
  static int ath_xchanmode = AH_TRUE;           /* enable extended channels */
  static int ath_maxvaps = ATH_MAXVAPS_DEFAULT;   /* set default maximum vaps */


@@ -8,7 +8,7 @@
  static char *autocreate = NULL;
  static char *ratectl = DEF_RATE_CTL;
  static int rfkill = 0;
  static char *autocreate = NULL;
  static char *ratectl = DEF_RATE_CTL;
  static int rfkill = 0;

-@@ -432,6 +433,7 @@
+@@ -432,6 +433,7 @@ MODULE_PARM(rfkill, "i");

  #ifdef ATH_CAP_TPC
  MODULE_PARM(tpc, "i");
  #endif
  #ifdef ATH_CAP_TPC
  MODULE_PARM(tpc, "i");
  #endif


@@ -16,7 +16,7 @@
  MODULE_PARM(autocreate, "s");
  MODULE_PARM(ratectl, "s");
  #else
  MODULE_PARM(autocreate, "s");
  MODULE_PARM(ratectl, "s");
  #else

-@@ -445,6 +447,7 @@
+@@ -445,6 +447,7 @@ module_param(rfkill, int, 0600);

  #ifdef ATH_CAP_TPC
  module_param(tpc, int, 0600);
  #endif
  #ifdef ATH_CAP_TPC
  module_param(tpc, int, 0600);
  #endif


@@ -24,7 +24,7 @@
  module_param(autocreate, charp, 0600);
  module_param(ratectl, charp, 0600);
  #endif
  module_param(autocreate, charp, 0600);
  module_param(ratectl, charp, 0600);
  #endif

-@@ -457,6 +460,7 @@
+@@ -457,6 +460,7 @@ MODULE_PARM_DESC(rfkill, "Enable/disable

  MODULE_PARM_DESC(tpc, "Enable/disable per-packet transmit power control (TPC) "
                "capability");
  #endif
  MODULE_PARM_DESC(tpc, "Enable/disable per-packet transmit power control (TPC) "
                "capability");
  #endif


@@ -32,7 +32,7 @@
  MODULE_PARM_DESC(autocreate, "Create ath device in "
                "[sta|ap|wds|adhoc|ahdemo|monitor] mode. defaults to sta, use "
                "'none' to disable");
  MODULE_PARM_DESC(autocreate, "Create ath device in "
                "[sta|ap|wds|adhoc|ahdemo|monitor] mode. defaults to sta, use "
                "'none' to disable");

-@@ -5062,7 +5066,7 @@
+@@ -5072,7 +5076,7 @@ ath_beacon_send(struct ath_softc *sc, in

                DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
                        "Missed %u consecutive beacons (n_beacon=%u)\n",
                        sc->sc_bmisscount, n_beacon);
                DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
                        "Missed %u consecutive beacons (n_beacon=%u)\n",
                        sc->sc_bmisscount, n_beacon);


@@ -41,7 +41,7 @@
                        ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
                return;
        }
                        ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
                return;
        }

-@@ -5218,7 +5222,7 @@
+@@ -5230,7 +5234,7 @@ ath_bstuck_tasklet(TQUEUE_ARG data)

         *     check will be true, in which case return
         *     without resetting the driver.
         */
         *     check will be true, in which case return
         *     without resetting the driver.
         */