simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / madwifi / patches / 306-bstuck_calibrate.patch

diff --git a/package/madwifi/patches/306-bstuck_calibrate.patch b/package/madwifi/patches/306-bstuck_calibrate.patch
index b58966f..1729132 100644 (file)
--- a/package/madwifi/patches/306-bstuck_calibrate.patch
+++ b/package/madwifi/patches/306-bstuck_calibrate.patch
@@ -1,7 +1,7 @@
 Index: madwifi-ng-r2568-20070710/ath/if_ath.c
 ===================================================================
 Index: madwifi-ng-r2568-20070710/ath/if_ath.c
 ===================================================================

---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-13 11:18:20.621471697 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-13 11:18:21.021494493 +0200
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c        2007-07-23 01:48:45.690583928 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c     2007-07-23 01:48:46.026603077 +0200

 @@ -153,6 +153,7 @@
  static void ath_turbo_switch_mode(unsigned long);
  static int ath_check_beacon_done(struct ath_softc *);
 @@ -153,6 +153,7 @@
  static void ath_turbo_switch_mode(unsigned long);
  static int ath_check_beacon_done(struct ath_softc *);


@@ -10,7 +10,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
  static void ath_beacon_send(struct ath_softc *, int *);
  static void ath_beacon_start_adhoc(struct ath_softc *, struct ieee80211vap *);
  static void ath_beacon_return(struct ath_softc *, struct ath_buf *);
  static void ath_beacon_send(struct ath_softc *, int *);
  static void ath_beacon_start_adhoc(struct ath_softc *, struct ieee80211vap *);
  static void ath_beacon_return(struct ath_softc *, struct ath_buf *);

-@@ -4173,7 +4174,7 @@
+@@ -4175,7 +4176,7 @@

                DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
                        "%s: missed %u consecutive beacons\n",
                        __func__, sc->sc_bmisscount);
                DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
                        "%s: missed %u consecutive beacons\n",
                        __func__, sc->sc_bmisscount);


@@ -19,7 +19,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
                        ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
                return;
        }
                        ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
                return;
        }

-@@ -4312,8 +4313,17 @@
+@@ -4314,8 +4315,17 @@

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


@@ -38,7 +38,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
        printk("%s: stuck beacon; resetting (bmiss count %u)\n",
                DEV_NAME(dev), sc->sc_bmisscount);
        ath_reset(dev);
        printk("%s: stuck beacon; resetting (bmiss count %u)\n",
                DEV_NAME(dev), sc->sc_bmisscount);
        ath_reset(dev);

-@@ -8027,17 +8037,13 @@
+@@ -8029,17 +8039,13 @@

   * Periodically recalibrate the PHY to account
   * for temperature/environment changes.
   */
   * Periodically recalibrate the PHY to account
   * for temperature/environment changes.
   */


@@ -57,7 +57,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
        DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x\n",
                __func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags);
  
        DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x\n",
                __func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags);
  

-@@ -8055,15 +8061,26 @@
+@@ -8057,15 +8063,26 @@

                        __func__, sc->sc_curchan.channel);
                sc->sc_stats.ast_per_calfail++;
        }
                        __func__, sc->sc_curchan.channel);
                sc->sc_stats.ast_per_calfail++;
        }


@@ -88,8 +88,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
  static void
 Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
 ===================================================================
  static void
 Index: madwifi-ng-r2568-20070710/ath/if_athvar.h
 ===================================================================

---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h     2007-07-13 11:18:20.353456423 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h  2007-07-13 11:18:21.021494493 +0200
+--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h     2007-07-23 01:48:45.406567742 +0200
++++ madwifi-ng-r2568-20070710/ath/if_athvar.h  2007-07-23 01:48:46.026603077 +0200

 @@ -538,7 +538,8 @@
   */
  #define ATH_TXQ_MOVE_Q(_tqs,_tqd)  ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd)
 @@ -538,7 +538,8 @@
   */
  #define ATH_TXQ_MOVE_Q(_tqs,_tqd)  ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd)