Changeset 16832

Timestamp:

04/20/11 23:37:59 (2 years ago)

Author:

BrainSlayer

Message:

ath9k try

Location:

src/router/wiviz2

Files:

• Makefile (modified) (1 diff)
• wiviz.c (modified) (4 diffs)
• wl_access.c (modified) (1 diff)

src/router/wiviz2/Makefile

@@ -32 +32 @@
 ifeq ($(CONFIG_RT2880),y)
 CCOPTS+=-DHAVE_RT2880 
+endif
+ifeq ($(CONFIG_ATH9K),y)
+CCOPTS+=-DHAVE_ATH9K
+CCOPTS+=-DHAVE_MADWIFI
 endif
 ifeq ($(CONFIG_RT61),y)

src/router/wiviz2/wiviz.c

@@ -114 +114 @@
 #ifdef HAVE_MADWIFI
   // return to original channel
+#ifdef HAVE_ATH9K
+if (!is_ath9k(wl_dev))
+#endif
+{
   sysprintf("iwconfig %s channel %sM",get_monitor(),nvram_nget("%s_channel",nvram_safe_get("wifi_display")));
   sleep(1);
@@ -124 +128 @@
      sysprintf("wlanconfig %s destroy",get_monitor());    
     }
+}
 #elif HAVE_RT2880
   nvram_set("wl0_mode",nvram_safe_get("wl0_oldmode"));
@@ -174 +179 @@
           cfg.readFromWl = 1;
 #else
+#ifdef HAVE_ATH9K
+if (!is_ath9k(nvram_safe_get("wifi_display")))
+#endif
+{
   if (is_ar5008(nvram_safe_get("wifi_display")))
     {
@@ -181 +190 @@
     }
           sysprintf("ifconfig %s up",get_monitor());
+}
           cfg.readFromWl = 1;
 #endif

src/router/wiviz2/wl_access.c

@@ -80 +80 @@
 char *get_monitor(void)
 {
+char *ifname = nvram_safe_get("wifi_display");
+#ifdef HAVE_ATH9K
+if (is_ath9k(ifname))
+    return "mon.ath0";
+else
+#endif
+{
 int devcount;
-char *ifname = nvram_safe_get("wifi_display");
 sscanf( ifname, "ath%d", &devcount );
 static char mon[32];
 sprintf(mon,"mon%d",devcount);
 return mon;
+}
 }
 #endif