Changeset 18915

Timestamp:

04/04/12 15:39:59 (14 months ago)

Author:

BrainSlayer

Message:

disallow ht40 selection if country or regulatory setting does not support these modes

Location:

src/router

Files:

• httpd/visuals/dd-wrt.c (modified) (7 diffs)
• httpd/visuals/setupassistant.c (modified) (5 diffs)
• libutils/mac80211info.c (modified) (1 diff)
• shared/wlutils.h (modified) (1 diff)

src/router/httpd/visuals/dd-wrt.c

@@ -4176 +4176 @@
 #if defined(HAVE_MADWIFI_MIMO) || defined(HAVE_ATH9K)
         if (is_ath11n(prefix)) {
+        
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
                 if ((nvram_nmatch("n-only", "%s_net_mode", prefix)
                      || nvram_nmatch("ng-only", "%s_net_mode", prefix)
@@ -4197 +4201 @@
                     || nvram_nmatch("na-only", "%s_net_mode", prefix))))
 #endif
+{
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
                 websWrite(wp,
                           "document.write(\"<option value=\\\"40\\\" %s >\" + share.turbo + \"</option>\");\n",
                           nvram_match(wl_width,
                                       "40") ? "selected=\\\"selected\\\"" : "");
+}
         websWrite(wp,
                   "document.write(\"<option value=\\\"20\\\" %s >\" + share.full + \"</option>\");\n",
                   nvram_match(wl_width,
                               "20") ? "selected=\\\"selected\\\"" : "");
-#ifdef HAVE_ATH9K
-}
-#endif
-#ifdef HAVE_ATH9K
-if (is_ath9k(prefix))
-#endif
-    {
+
+#if defined(HAVE_MADWIFI_MIMO) || defined(HAVE_ATH9K)
+}
+#endif
+#if defined(HAVE_MADWIFI) || defined(HAVE_ATH9K) && !defined(HAVE_MADIFI_MIMO)
+{
 websWrite(wp,
           "document.write(\"<option value=\\\"10\\\" %s >\" + share.half + \"</option>\");\n",
@@ -4227 +4235 @@
 #endif
 }
+#endif
 websWrite(wp, "//]]>\n</script>\n");
 websWrite(wp, "</select>\n");
@@ -4823 +4832 @@
 #if defined(HAVE_MADWIFI_MIMO) || defined(HAVE_ATH9K)
 /* limit channel options by mode */
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
         if (is_ath11n(prefix)) {
                 if ((nvram_nmatch("n-only", "%s_net_mode", prefix)
@@ -4844 +4856 @@
                     || nvram_nmatch("na-only", "%s_net_mode", prefix))))
 #endif
+{
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
                 websWrite(wp,
                           "document.write(\"<option value=\\\"40\\\" %s >\" + share.turbo + \"</option>\");\n",
                           nvram_match(wl_width,
                                       "40") ? "selected=\\\"selected\\\"" : "");
+}
         websWrite(wp,
                   "document.write(\"<option value=\\\"20\\\" %s >\" + share.full + \"</option>\");\n",
                   nvram_match(wl_width,
                               "20") ? "selected=\\\"selected\\\"" : "");
-#ifdef HAVE_ATH9K
-if (is_ath9k(prefix))
-#endif
+
+#if defined(HAVE_MADWIFI) || defined(HAVE_ATH9K) && !defined(HAVE_MADIFI_MIMO)
     {
         websWrite(wp,
@@ -4864 +4880 @@
                   nvram_match(wl_width,
                               "5") ? "selected=\\\"selected\\\"" : "");
-    }
 #ifdef HAVE_SUBQUARTER
         if(registered_has_subquarter()) {
@@ -4873 +4888 @@
                               "2") ? "selected=\\\"selected\\\"" : "");
         }
+#endif
+    }
 #endif
         websWrite(wp, "//]]>\n</script>\n");

src/router/httpd/visuals/setupassistant.c

@@ -710 +710 @@
                      || nvram_selnmatch(wp, "n5-only", "%s_net_mode", prefix)
                      || nvram_selnmatch(wp, "na-only", "%s_net_mode", prefix)))
+                    {
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
                         websWrite(wp,
                                   "document.write(\"<option value=\\\"2040\\\" %s >\" + share.dynamicturbo + \"</option>\");\n",
@@ -715 +719 @@
                                                  "2040") ?
                                   "selected=\\\"selected\\\"" : "");
+                    }
         }
         if (!is_ath11n(prefix)
@@ -724 +729 @@
                     || nvram_selnmatch(wp, "na-only", "%s_net_mode", prefix))))
 #endif
+{
+#if defined(HAVE_ATH9K)
+                if (has_ht40(prefix))
+#endif
                 websWrite(wp,
                           "document.write(\"<option value=\\\"40\\\" %s >\" + share.turbo + \"</option>\");\n",
@@ -729 +738 @@
                                          "40") ? "selected=\\\"selected\\\"" :
                           "");
+}
         websWrite(wp,
                   "document.write(\"<option value=\\\"20\\\" %s >\" + share.full + \"</option>\");\n",
                   nvram_selmatch(wp, wl_width,
                                  "20") ? "selected=\\\"selected\\\"" : "");
-#ifdef HAVE_ATH9K
-        if (!is_ath9k(prefix))
-#endif
+#if defined(HAVE_MADWIFI) || defined(HAVE_ATH9K) && !defined(HAVE_MADIFI_MIMO)
         {
                 websWrite(wp,
@@ -756 +764 @@
 #endif
         }
+#endif
         websWrite(wp, "//]]>\n</script>\n");
         websWrite(wp, "</select>\n");

src/router/libutils/mac80211info.c

@@ -649 +649 @@
 }
 
+
+int has_ht40(char *interface) {
+                struct wifi_channels *chan;
+                int found=0;
+                int i=0;
+                char regdomain[32];
+                char *country;
+
+                sprintf(regdomain, "%s_regdomain", interface);
+                country = nvram_default_get(regdomain, "UNITED_STATES");
+
+                chan = mac80211_get_channels(interface, getIsoName(country), 40, 0xff);
+                if (chan != NULL)
+                        while (chan[i].freq != -1) {
+                                if (chan[i].ht40plus || chan[i].ht40minus) {
+                                        free(chan);
+                                        return 1;
+                                }
+                        i++;
+                        }
+                if (chan != NULL)
+                        free(chan);
+                return 0;
+}
+
+
 int mac80211_check_valid_frequency(char *interface, char *country, int freq) {
                 struct wifi_channels *chan;

src/router/shared/wlutils.h

@@ -96 +96 @@
 extern int has_2ghz(char *prefix);
 extern int has_5ghz(char *prefix);
+extern int has_ht40(char *prefix);
 
 #define SITE_SURVEY_DB  "/tmp/site_survey"