[kernel] refresh 3.0 patches

[openwrt.git] / package / madwifi / patches / 424-timing.patch

diff --git a/package/madwifi/patches/424-timing.patch b/package/madwifi/patches/424-timing.patch
index 3d1d6e0..8369db6 100644 (file)
--- a/package/madwifi/patches/424-timing.patch
+++ b/package/madwifi/patches/424-timing.patch
@@ -196,10 +196,12 @@
  static inline void ath_hal_beaconinit(struct ath_hal *ah, u_int32_t nexttbtt,
                                      u_int32_t intval)
  {
-@@ -841,6 +852,17 @@ static inline HAL_BOOL ath_hal_setslotti
+@@ -839,6 +850,17 @@ static inline HAL_BOOL ath_hal_setslotti
+       ath_hal_set_function(NULL);
+       ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
        return ret;
- }
- 
++}
++
 +static inline HAL_BOOL ath_hal_seteifstime(struct ath_hal *ah, u_int a1)
 +{
 +      HAL_BOOL ret;
@@ -209,11 +211,9 @@
 +      ath_hal_set_function(NULL);
 +      ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
 +      return ret;
-+}
-+
+ }
+ 
  static inline void ath_hal_setledstate(struct ath_hal *ah, HAL_LED_STATE a1)
- {
-       ATH_HAL_LOCK_IRQ(ah->ah_sc);
 --- a/ath/if_athvar.h
 +++ b/ath/if_athvar.h
 @@ -613,6 +613,15 @@ struct ath_rp {
@@ -446,7 +446,7 @@
  {
 --- a/ath_rate/sample/sample.c
 +++ b/ath_rate/sample/sample.c
-@@ -137,92 +137,6 @@ rate_to_ndx(struct sample_node *sn, int 
+@@ -137,92 +137,6 @@ rate_to_ndx(struct sample_node *sn, int
        return -1;
  }
  
@@ -541,7 +541,7 @@
  ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
 --- a/net80211/ieee80211_wireless.c
 +++ b/net80211/ieee80211_wireless.c
-@@ -2736,6 +2736,7 @@ ieee80211_ioctl_setparam(struct net_devi
+@@ -2745,6 +2745,7 @@ ieee80211_ioctl_setparam(struct net_devi
        case IEEE80211_PARAM_COVERAGE_CLASS:
                if (value <= IEEE80211_COVERAGE_CLASS_MAX) {
                        ic->ic_coverageclass = value;
@@ -568,7 +568,7 @@
  
 -ALLPROGS=     athstats 80211stats athkey athchans athctrl \
 +ALLPROGS=     athstats 80211stats athkey athchans \
-       athdebug 80211debug wlanconfig ath_info
+       $(if $(DEBUG),athdebug 80211debug) wlanconfig ath_info
  
  OBJS= $(patsubst %,%.o,$(ALLPROGS))
 --- a/tools/athctrl.c