Changeset 1407

Timestamp:

01/23/06 08:07:51 (3 years ago)

Author:

svens

Message:

autocreation patch

Files:

• trunk/ath/if_ath.c (modified) (7 diffs)
• trunk/net80211/ieee80211.c (modified) (1 diff)
• trunk/net80211/ieee80211_linux.h (modified) (1 diff)
• trunk/net80211/ieee80211_wireless.c (modified) (1 diff)

trunk/ath/if_ath.c

@@ -58 +58 @@
-#include <linux/proc_fs.h>
-#include <linux/if_arp.h>
-
+
-#include <asm/uaccess.h>
-
@@ -257 +257 @@
-static  int ath_outdoor = AH_FALSE;             /* enable outdoor use */
-static  int ath_xchanmode = AH_TRUE;            /* enable extended channels */
-
+
-static  int rfkill = -1;
-static  int countrycode = -1;
@@ -287 +287 @@
-MODULE_PARM(xchanmode, "i");
-MODULE_PARM(rfkill, "i");
+MODULE_PARM(autocreate, "s");
-#else
-#include <linux/moduleparam.h>
@@ -293 +294 @@
-module_param(xchanmode, int, 0);
-module_param(rfkill, int, 0);
+module_param(autocreate, charp, 0);
-#endif
-MODULE_PARM_DESC(countrycode, "Override default country code");
@@ -298 +300 @@
-MODULE_PARM_DESC(xchanmode, "Enable/disable extended channel mode");
-MODULE_PARM_DESC(rfkill, "Enable/disable RFKILL capability");
-
+
-#ifdef AR_DEBUG
-
@@ -390 +392 @@
-        HAL_STATUS status;
-        int error = 0,i;
+        int autocreatemode = IEEE80211_M_STA;
-        u_int8_t csz;
-
@@ -866 +869 @@
-        printk("%s: TX99 support enabled\n", dev->name);
-#endif
+        sc->sc_invalid = 0;
+
+        if(autocreate) {
+                if(!strcmp(autocreate, "none"))
+                        autocreatemode = 0;
+                else if(!strcmp(autocreate, "sta"))
+                        autocreatemode = IEEE80211_M_STA;
+                else if (!strcmp(autocreate, "ap"))
+                        autocreatemode = IEEE80211_M_HOSTAP;
+                else if (!strcmp(autocreate, "adhoc"))
+                        autocreatemode = IEEE80211_M_IBSS;
+                else if (!strcmp(autocreate, "ahdemo"))
+                        autocreatemode = IEEE80211_M_AHDEMO;
+                else if (!strcmp(autocreate, "wds"))
+                        autocreatemode = IEEE80211_M_WDS;
+                else if (!strcmp(autocreate, "monitor"))
+                        autocreatemode = IEEE80211_M_MONITOR;
+                else 
+                        printk(KERN_INFO "Unknown autocreate mode: %s\n", autocreate);
+        }
+        if(autocreatemode) {
+                rtnl_lock();
+                error = ieee80211_create_vap(ic, "ath%d", dev, autocreatemode, IEEE80211_CLONE_BSSID);
+                rtnl_unlock();
+                if(error)
+                        printk(KERN_ERR "%s: autocreation of vap failed: %d\n", dev->name, error);
+        }
+
-        return 0;
-bad3:

trunk/net80211/ieee80211.c

@@ -378 +378 @@
-        struct ieee80211vap *vap = dev->priv;
-        struct net_device *parent = ic->ic_dev;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        dev->get_stats = ieee80211_getstats;
-        dev->open = ieee80211_open;

trunk/net80211/ieee80211_linux.h

@@ -445 +445 @@
-struct ifreq;
-int     ieee80211_ioctl_create_vap(struct ieee80211com *, struct ifreq *, struct net_device *);
-
+
-#endif /* _NET80211_IEEE80211_LINUX_H_ */

trunk/net80211/ieee80211_wireless.c

@@ -4066 +4066 @@
-}
-EXPORT_SYMBOL(ieee80211_ioctl_create_vap);
+/*
+ * Create a virtual ap.  This is public as it must be implemented
+ * outside our control (e.g. in the driver).
+ * Must be called with rtnl_lock held
+ */
+int
+ieee80211_create_vap(struct ieee80211com *ic, char *name, struct net_device *mdev, int opmode, int opflags)
+{
+        struct ieee80211vap *vap;
+        int error, unit;
+        
+        if((error = ifc_name2unit(name, &unit)))
+                return error;
+
+        if (unit == -1) {
+                if((unit = ieee80211_new_wlanunit()) == -1)
+                        return -EIO;            /* XXX */
+        } else {
+                if (!ieee80211_alloc_wlanunit(unit))
+                        return -EINVAL;
+
+        }
+
+        if((vap = ic->ic_vap_create(ic, name, unit, opmode, opflags, mdev)) == NULL) {
+                ieee80211_delete_wlanunit(unit);
+                return -EIO;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(ieee80211_create_vap);
+
-
-void