Changeset 9070

Timestamp:

02/19/08 16:55:53 (5 years ago)

Author:

BrainSlayer

Message:

prepare for new driver

Location:

src/router

Files:

• httpd/modules/dd-wrt.c (modified) (3 diffs)
• services/networking/madwifi.c (modified) (2 diffs)
• services/sysinit/sysinit-gateworx.c (modified) (1 diff)
• shared/wl.c (modified) (4 diffs)
• shared/wl_macfuncs.c (modified) (1 diff)

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

@@ -5395 +5395 @@
 validate_wds (webs_t wp, char *value, struct variable *v)
 {
-#ifdef HAVE_MSSID
+#ifdef HAVE_MADWIFI
+  int h, i, devcount = 0;       //changed from 2 to 3
+#elif HAVE_MSSID
   int h, i, devcount = 1;       //changed from 2 to 3
 #else
@@ -5597 +5599 @@
         {
 #ifdef HAVE_MADWIFI
-          snprintf (wds_if, 31, "wds%s.%d", interface, (devcount++));
+          snprintf (wds_if, 31, "%s.wds%d", interface, (devcount++));
 #else
 //quick and dirty
@@ -6177 +6179 @@
           if (nvram_match (wdsvarname, "0"))
             continue;
-          sprintf (var, "wdsath%d.%d", i, s);
+          sprintf (var, "ath%d.wds%d", i, s);
           cnt = ej_active_wireless_if (wp, argc, argv, var, cnt, t);
         }

src/router/services/networking/madwifi.c

@@ -127 +127 @@
         IOCTL_ERR (IEEE80211_IOCTL_DELMAC),
         IOCTL_ERR (IEEE80211_IOCTL_WDSADDMAC),
-        IOCTL_ERR (IEEE80211_IOCTL_WDSDELMAC),
+        IOCTL_ERR (IEEE80211_IOCTL_WDSSETMAC),
       };
       op -= SIOCIWFIRSTPRIV;
@@ -1202 +1202 @@
       if (hwaddr != NULL)
         {
-          eval ("wlanconfig", wdsdev, "create", "wlandev", wif, "wlanmode",
-                "wds", "nobssid");
+         // eval ("wlanconfig", wdsdev, "create", "wlandev", wif, "wlanmode",
+        //      "wds", "nobssid");
 //        eval ("ifconfig",wdsdev,"0.0.0.0","up");d
-          eval ("iwpriv", wdsdev, "wds_add", hwaddr);
-          eval ("iwpriv", wdsdev, "wds", "1");
+          eval ("iwpriv", dev, "wds_add", hwaddr);
+          eval ("iwpriv", dev, "wds", "1");
         }
     }

src/router/services/sysinit/sysinit-gateworx.c

@@ -239 +239 @@
 
 
+  eval ("insmod", "ath_hal");
   eval ("insmod", "ath_pci");
 

src/router/shared/wl.c

@@ -190 +190 @@
 
 #include "wireless.h"
+#undef WPA_OUI
+#undef WME_OUI
 #include "net80211/ieee80211.h"
 #include "net80211/ieee80211_crypto.h"
@@ -327 +329 @@
         IOCTL_ERR (IEEE80211_IOCTL_DELMAC),
         IOCTL_ERR (IEEE80211_IOCTL_WDSADDMAC),
-        IOCTL_ERR (IEEE80211_IOCTL_WDSDELMAC),
+        IOCTL_ERR (IEEE80211_IOCTL_WDSSETMAC),
       };
       op -= SIOCIWFIRSTPRIV;
@@ -496 +498 @@
             continue;
         }
+#ifdef GIBTSNICHT
       if (IEEE80211_IS_CHAN_11NA (&achans.ic_chans[i]))
         {
@@ -508 +511 @@
             continue;
         }
+#endif
       //filter out B/G channels if mode isnt g-only, b-only or mixed
       if (IEEE80211_IS_CHAN_ANYG (&achans.ic_chans[i])

src/router/shared/wl_macfuncs.c

@@ -147 +147 @@
         IOCTL_ERR (IEEE80211_IOCTL_DELMAC),
         IOCTL_ERR (IEEE80211_IOCTL_WDSADDMAC),
-        IOCTL_ERR (IEEE80211_IOCTL_WDSDELMAC),
+        IOCTL_ERR (IEEE80211_IOCTL_WDSSETMAC),
       };
       op -= SIOCIWFIRSTPRIV;