Merge r15694 to 8.09
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 12 May 2009 22:47:04 +0000 (22:47 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 12 May 2009 22:47:04 +0000 (22:47 +0000)
SVN-Revision: 15808

package/madwifi/patches/421-channel_handling.patch

index 697dfcf..820e09a 100644 (file)
        struct ath_hal *ah = sc->sc_ah;
        u_int val;
        u_int tab_3_val[3];
-@@ -11030,25 +11135,33 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -11030,25 +11135,34 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
                                lenp, ppos);
                if (ret == 0) {
                        switch ((long)ctl->extra2) {
 +                      case ATH_REGDOMAIN:
 +                              ath_hal_setregdomain(ah, val);
 +                              break;
++                      case ATH_OUTDOOR:
 +                      case ATH_COUNTRYCODE:
 +                      case ATH_CHANBW:
 +                              ret = ath_sysctl_setchanparam(sc, (long) ctl->extra2, val);
                                break;
                        case ATH_SOFTLED:
                                if (val != sc->sc_softled) {
-@@ -11201,6 +11314,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -11201,6 +11315,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
                }
        } else {
                switch ((long)ctl->extra2) {
                case ATH_SLOTTIME:
                        val = ath_hal_getslottime(ah);
                        break;
-@@ -11219,6 +11335,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -11219,6 +11336,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
                case ATH_COUNTRYCODE:
                        ath_hal_getcountrycode(ah, &val);
                        break;
                case ATH_MAXVAPS:
                        val = ath_maxvaps;
                        break;
-@@ -11332,11 +11451,17 @@ static const ctl_table ath_sysctl_templa
+@@ -11332,11 +11452,17 @@ static const ctl_table ath_sysctl_templa
        },
        { .ctl_name     = CTL_AUTO,
          .procname     = "countrycode",
          .procname     = "maxvaps",
          .mode         = 0444,
          .proc_handler = ath_sysctl_halparam,
-@@ -11344,7 +11469,7 @@ static const ctl_table ath_sysctl_templa
+@@ -11344,7 +11470,7 @@ static const ctl_table ath_sysctl_templa
        },
        { .ctl_name     = CTL_AUTO,
          .procname     = "regdomain",
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_REGDOMAIN,
        },
-@@ -11407,6 +11532,12 @@ static const ctl_table ath_sysctl_templa
+@@ -11407,6 +11533,12 @@ static const ctl_table ath_sysctl_templa
          .extra2       = (void *)ATH_ACKRATE,
        },
        { .ctl_name     = CTL_AUTO,
          .procname     = "rp",
          .mode         = 0200,
          .proc_handler = ath_sysctl_halparam,
-@@ -11647,13 +11778,6 @@ static ctl_table ath_static_sysctls[] = 
+@@ -11647,13 +11779,6 @@ static ctl_table ath_static_sysctls[] = 
        },
  #endif
        { .ctl_name     = CTL_AUTO,
          .procname     = "maxvaps",
          .mode         = 0444,
          .data         = &ath_maxvaps,
-@@ -11661,13 +11785,6 @@ static ctl_table ath_static_sysctls[] = 
+@@ -11661,13 +11786,6 @@ static ctl_table ath_static_sysctls[] = 
          .proc_handler = proc_dointvec
        },
        { .ctl_name     = CTL_AUTO,