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

[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 93b6996..8369db6 100644 (file)
--- a/package/madwifi/patches/424-timing.patch
+++ b/package/madwifi/patches/424-timing.patch
@@ -100,7 +100,7 @@
  
        if (bfaddr != 0) {
                /*
  
        if (bfaddr != 0) {
                /*

-@@ -9430,7 +9468,8 @@ ath_set_coverageclass(struct ieee80211co
+@@ -9433,7 +9471,8 @@ ath_set_coverageclass(struct ieee80211co

  {
        struct ath_softc *sc = ic->ic_dev->priv;
  
  {
        struct ath_softc *sc = ic->ic_dev->priv;
  


@@ -110,7 +110,7 @@
  
        return;
  }
  
        return;
  }

-@@ -10953,6 +10992,7 @@ enum {
+@@ -10956,6 +10995,7 @@ enum {

        ATH_OFDM_WEAK_DET       = 29,
        ATH_CHANBW              = 30,
        ATH_OUTDOOR             = 31,
        ATH_OFDM_WEAK_DET       = 29,
        ATH_CHANBW              = 30,
        ATH_OUTDOOR             = 31,


@@ -118,7 +118,7 @@
  };
  
  /*
  };
  
  /*

-@@ -11165,21 +11205,31 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -11168,21 +11208,31 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl

                                        sc->sc_slottimeconf = val;
                                else
                                        sc->sc_slottimeconf = 0;
                                        sc->sc_slottimeconf = val;
                                else
                                        sc->sc_slottimeconf = 0;


@@ -153,7 +153,7 @@
                                break;
                        case ATH_SOFTLED:
                                if (val != sc->sc_softled) {
                                break;
                        case ATH_SOFTLED:
                                if (val != sc->sc_softled) {

-@@ -11335,6 +11385,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -11338,6 +11388,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl

                case ATH_CHANBW:
                        val = sc->sc_chanbw ?: 20;
                        break;
                case ATH_CHANBW:
                        val = sc->sc_chanbw ?: 20;
                        break;


@@ -163,7 +163,7 @@
                case ATH_SLOTTIME:
                        val = ath_hal_getslottime(ah);
                        break;
                case ATH_SLOTTIME:
                        val = ath_hal_getslottime(ah);
                        break;

-@@ -11456,6 +11509,12 @@ static const ctl_table ath_sysctl_templa
+@@ -11459,6 +11512,12 @@ static const ctl_table ath_sysctl_templa

          .extra2       = (void *)ATH_CTSTIMEOUT,
        },
        { .ctl_name     = CTL_AUTO,
          .extra2       = (void *)ATH_CTSTIMEOUT,
        },
        { .ctl_name     = CTL_AUTO,


@@ -196,10 +196,12 @@
  static inline void ath_hal_beaconinit(struct ath_hal *ah, u_int32_t nexttbtt,
                                      u_int32_t intval)
  {
  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;
        return ret;

- }
- 
++}
++

 +static inline HAL_BOOL ath_hal_seteifstime(struct ath_hal *ah, u_int a1)
 +{
 +      HAL_BOOL 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;
 +      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)
  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 {
 --- 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
  {
 --- 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;
  }
  
        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
  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;
        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 \
  
 -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
  
  OBJS= $(patsubst %,%.o,$(ALLPROGS))
 --- a/tools/athctrl.c