1 files changed, 80 insertions, 44 deletions

diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index 8ce6e961c5da..a0e9f6aed7da 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -25,7 +25,7 @@
   file called LICENSE.
 
   Contact Information:
-  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Linux Wireless <ilw@linux.intel.com>
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 
 *******************************************************************************/
@@ -50,11 +50,11 @@
 #include <net/net_namespace.h>
 #include <net/arp.h>
 
-#include "ieee80211.h"
+#include "libipw.h"
 
 #define DRV_DESCRIPTION "802.11 data/management/control stack"
 #define DRV_NAME        "ieee80211"
-#define DRV_VERSION     IEEE80211_VERSION
+#define DRV_VERSION     LIBIPW_VERSION
 #define DRV_COPYRIGHT   "Copyright (C) 2004-2005 Intel Corporation <jketreno@linux.intel.com>"
 
 MODULE_VERSION(DRV_VERSION);
@@ -62,13 +62,16 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 
-static int ieee80211_networks_allocate(struct ieee80211_device *ieee)
+struct cfg80211_ops libipw_config_ops = { };
+void *libipw_wiphy_privid = &libipw_wiphy_privid;
+
+static int libipw_networks_allocate(struct libipw_device *ieee)
 {
         if (ieee->networks)
                 return 0;
 
         ieee->networks =
-            kzalloc(MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
+            kzalloc(MAX_NETWORK_COUNT * sizeof(struct libipw_network),
                     GFP_KERNEL);
         if (!ieee->networks) {
                 printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
@@ -79,7 +82,7 @@ static int ieee80211_networks_allocate(struct ieee80211_device *ieee)
         return 0;
 }
 
-void ieee80211_network_reset(struct ieee80211_network *network)
+void libipw_network_reset(struct libipw_network *network)
 {
         if (!network)
                 return;
@@ -90,7 +93,7 @@ void ieee80211_network_reset(struct ieee80211_network *network)
         }
 }
 
-static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
+static inline void libipw_networks_free(struct libipw_device *ieee)
 {
         int i;
 
@@ -105,10 +108,10 @@ static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
         ieee->networks = NULL;
 }
 
-void ieee80211_networks_age(struct ieee80211_device *ieee,
+void libipw_networks_age(struct libipw_device *ieee,
                             unsigned long age_secs)
 {
-        struct ieee80211_network *network = NULL;
+        struct libipw_network *network = NULL;
         unsigned long flags;
         unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC);
 
@@ -118,9 +121,9 @@ void ieee80211_networks_age(struct ieee80211_device *ieee,
         }
         spin_unlock_irqrestore(&ieee->lock, flags);
 }
-EXPORT_SYMBOL(ieee80211_networks_age);
+EXPORT_SYMBOL(libipw_networks_age);
 
-static void ieee80211_networks_initialize(struct ieee80211_device *ieee)
+static void libipw_networks_initialize(struct libipw_device *ieee)
 {
         int i;
 
@@ -131,38 +134,59 @@ static void ieee80211_networks_initialize(struct ieee80211_device *ieee)
                               &ieee->network_free_list);
 }
 
-int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
+int libipw_change_mtu(struct net_device *dev, int new_mtu)
 {
-        if ((new_mtu < 68) || (new_mtu > IEEE80211_DATA_LEN))
+        if ((new_mtu < 68) || (new_mtu > LIBIPW_DATA_LEN))
                 return -EINVAL;
         dev->mtu = new_mtu;
         return 0;
 }
-EXPORT_SYMBOL(ieee80211_change_mtu);
+EXPORT_SYMBOL(libipw_change_mtu);
 
-struct net_device *alloc_ieee80211(int sizeof_priv)
+struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
 {
-        struct ieee80211_device *ieee;
+        struct libipw_device *ieee;
         struct net_device *dev;
         int err;
 
-        IEEE80211_DEBUG_INFO("Initializing...\n");
+        LIBIPW_DEBUG_INFO("Initializing...\n");
 
-        dev = alloc_etherdev(sizeof(struct ieee80211_device) + sizeof_priv);
+        dev = alloc_etherdev(sizeof(struct libipw_device) + sizeof_priv);
         if (!dev) {
-                IEEE80211_ERROR("Unable to allocate network device.\n");
+                LIBIPW_ERROR("Unable to allocate network device.\n");
                 goto failed;
         }
         ieee = netdev_priv(dev);
 
         ieee->dev = dev;
 
-        err = ieee80211_networks_allocate(ieee);
+        if (!monitor) {
+                ieee->wdev.wiphy = wiphy_new(&libipw_config_ops, 0);
+                if (!ieee->wdev.wiphy) {
+                        LIBIPW_ERROR("Unable to allocate wiphy.\n");
+                        goto failed_free_netdev;
+                }
+
+                ieee->dev->ieee80211_ptr = &ieee->wdev;
+                ieee->wdev.iftype = NL80211_IFTYPE_STATION;
+
+                /* Fill-out wiphy structure bits we know...  Not enough info
+                   here to call set_wiphy_dev or set MAC address or channel info
+                   -- have to do that in ->ndo_init... */
+                ieee->wdev.wiphy->privid = libipw_wiphy_privid;
+
+                ieee->wdev.wiphy->max_scan_ssids = 1;
+                ieee->wdev.wiphy->max_scan_ie_len = 0;
+                ieee->wdev.wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
+                                                | BIT(NL80211_IFTYPE_ADHOC);
+        }
+
+        err = libipw_networks_allocate(ieee);
         if (err) {
-                IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
-                goto failed_free_netdev;
+                LIBIPW_ERROR("Unable to allocate beacon storage: %d\n", err);
+                goto failed_free_wiphy;
         }
-        ieee80211_networks_initialize(ieee);
+        libipw_networks_initialize(ieee);
 
         /* Default fragmentation threshold is maximum payload size */
         ieee->fts = DEFAULT_FTS;
@@ -193,33 +217,45 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 
         return dev;
 
+failed_free_wiphy:
+        if (!monitor)
+                wiphy_free(ieee->wdev.wiphy);
 failed_free_netdev:
         free_netdev(dev);
 failed:
         return NULL;
 }
 
-void free_ieee80211(struct net_device *dev)
+void free_ieee80211(struct net_device *dev, int monitor)
 {
-        struct ieee80211_device *ieee = netdev_priv(dev);
+        struct libipw_device *ieee = netdev_priv(dev);
 
         lib80211_crypt_info_free(&ieee->crypt_info);
 
-        ieee80211_networks_free(ieee);
+        libipw_networks_free(ieee);
+
+        /* free cfg80211 resources */
+        if (!monitor) {
+                wiphy_unregister(ieee->wdev.wiphy);
+                kfree(ieee->a_band.channels);
+                kfree(ieee->bg_band.channels);
+                wiphy_free(ieee->wdev.wiphy);
+        }
+
         free_netdev(dev);
 }
 
 #ifdef CONFIG_LIBIPW_DEBUG
 
 static int debug = 0;
-u32 ieee80211_debug_level = 0;
-EXPORT_SYMBOL_GPL(ieee80211_debug_level);
-static struct proc_dir_entry *ieee80211_proc = NULL;
+u32 libipw_debug_level = 0;
+EXPORT_SYMBOL_GPL(libipw_debug_level);
+static struct proc_dir_entry *libipw_proc = NULL;
 
 static int show_debug_level(char *page, char **start, off_t offset,
                             int count, int *eof, void *data)
 {
-        return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
+        return snprintf(page, count, "0x%08X\n", libipw_debug_level);
 }
 
 static int store_debug_level(struct file *file, const char __user * buffer,
@@ -236,29 +272,29 @@ static int store_debug_level(struct file *file, const char __user * buffer,
                 printk(KERN_INFO DRV_NAME
                        ": %s is not in hex or decimal form.\n", buf);
         else
-                ieee80211_debug_level = val;
+                libipw_debug_level = val;
 
         return strnlen(buf, len);
 }
 #endif                          /* CONFIG_LIBIPW_DEBUG */
 
-static int __init ieee80211_init(void)
+static int __init libipw_init(void)
 {
 #ifdef CONFIG_LIBIPW_DEBUG
         struct proc_dir_entry *e;
 
-        ieee80211_debug_level = debug;
-        ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
-        if (ieee80211_proc == NULL) {
-                IEEE80211_ERROR("Unable to create " DRV_NAME
+        libipw_debug_level = debug;
+        libipw_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
+        if (libipw_proc == NULL) {
+                LIBIPW_ERROR("Unable to create " DRV_NAME
                                 " proc directory\n");
                 return -EIO;
         }
         e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
-                              ieee80211_proc);
+                              libipw_proc);
         if (!e) {
                 remove_proc_entry(DRV_NAME, init_net.proc_net);
-                ieee80211_proc = NULL;
+                libipw_proc = NULL;
                 return -EIO;
         }
         e->read_proc = show_debug_level;
@@ -272,13 +308,13 @@ static int __init ieee80211_init(void)
         return 0;
 }
 
-static void __exit ieee80211_exit(void)
+static void __exit libipw_exit(void)
 {
 #ifdef CONFIG_LIBIPW_DEBUG
-        if (ieee80211_proc) {
-                remove_proc_entry("debug_level", ieee80211_proc);
+        if (libipw_proc) {
+                remove_proc_entry("debug_level", libipw_proc);
                 remove_proc_entry(DRV_NAME, init_net.proc_net);
-                ieee80211_proc = NULL;
+                libipw_proc = NULL;
         }
 #endif                          /* CONFIG_LIBIPW_DEBUG */
 }
@@ -289,8 +325,8 @@ module_param(debug, int, 0444);
 MODULE_PARM_DESC(debug, "debug output mask");
 #endif                          /* CONFIG_LIBIPW_DEBUG */
 
-module_exit(ieee80211_exit);
-module_init(ieee80211_init);
+module_exit(libipw_exit);
+module_init(libipw_init);
 
 EXPORT_SYMBOL(alloc_ieee80211);
 EXPORT_SYMBOL(free_ieee80211);