Patched in Tegra support.

11 files changed, 74 insertions, 43 deletions

diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index d39e3e24077..e0b3e8d406b 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -1,6 +1,5 @@
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 #include <net/lib80211.h>
 #include <linux/if_arp.h>
 
@@ -415,7 +414,7 @@ static void hostap_rx_sta_beacon(local_info_t *local, struct sk_buff *skb,
                         ssid = pos + 2;
                         ssid_len = pos[1];
                         break;
-                case WLAN_EID_VENDOR_SPECIFIC:
+                case WLAN_EID_GENERIC:
                         if (pos[1] >= 4 &&
                             pos[2] == 0x00 && pos[3] == 0x50 &&
                             pos[4] == 0xf2 && pos[5] == 1) {
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 344a981a052..c34a3b7f129 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -1,5 +1,4 @@
 #include <linux/slab.h>
-#include <linux/export.h>
 
 #include "hostap_80211.h"
 #include "hostap_common.h"
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index c6ea995750d..3d05dc15c6b 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -21,8 +21,6 @@
 #include <linux/random.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
-#include <linux/export.h>
-#include <linux/moduleparam.h>
 
 #include "hostap_wlan.h"
 #include "hostap.h"
@@ -860,10 +858,10 @@ void hostap_free_data(struct ap_data *ap)
                 return;
         }
 
-        flush_work(&ap->add_sta_proc_queue);
+        flush_work_sync(&ap->add_sta_proc_queue);
 
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
-        flush_work(&ap->wds_oper_queue);
+        flush_work_sync(&ap->wds_oper_queue);
         if (ap->crypt)
                 ap->crypt->deinit(ap->crypt_priv);
         ap->crypt = ap->crypt_priv = NULL;
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 89e9d3a78c3..5441ad19511 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -656,9 +656,6 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {
                 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
                 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
         PCMCIA_DEVICE_PROD_ID123(
-                "Canon", "Wireless LAN CF Card K30225", "Version 01.00",
-                0x96ef6fe2, 0x263fcbab, 0xa57adb8c),
-        PCMCIA_DEVICE_PROD_ID123(
                 "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
                 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
         PCMCIA_DEVICE_PROD_ID123(
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 8e7000fd441..a8bddd81b4d 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -347,9 +347,11 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
                 return -EINTR;
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-        if (entry == NULL)
+        if (entry == NULL) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
+                       dev->name);
                 return -ENOMEM;
-
+        }
         atomic_set(&entry->usecnt, 1);
         entry->type = CMD_SLEEP;
         entry->cmd = cmd;
@@ -513,9 +515,11 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
         }
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-        if (entry == NULL)
+        if (entry == NULL) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
+                       "failed\n", dev->name);
                 return -ENOMEM;
-
+        }
         atomic_set(&entry->usecnt, 1);
         entry->type = CMD_CALLBACK;
         entry->cmd = cmd;
@@ -1466,7 +1470,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial)
          * before it starts acting as an AP, so reset port automatically
          * here just in case */
         if (initial && prism2_reset_port(dev)) {
-                printk("%s: MAC port 0 resetting failed\n", dev->name);
+                printk("%s: MAC port 0 reseting failed\n", dev->name);
                 return 1;
         }
 
@@ -1557,7 +1561,7 @@ static void prism2_hw_reset(struct net_device *dev)
         static long last_reset = 0;
 
         /* do not reset card more than once per second to avoid ending up in a
-         * busy loop resetting the card */
+         * busy loop reseting the card */
         if (time_before_eq(jiffies, last_reset + HZ))
                 return;
         last_reset = jiffies;
@@ -2974,9 +2978,11 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set)
         local = iface->local;
 
         new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);
-        if (new_entry == NULL)
+        if (new_entry == NULL) {
+                printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
+                       local->dev->name);
                 return -ENOMEM;
-
+        }
         new_entry->aid = aid;
         new_entry->set = set;
 
@@ -3311,13 +3317,13 @@ static void prism2_free_local_data(struct net_device *dev)
 
         unregister_netdev(local->dev);
 
-        flush_work(&local->reset_queue);
-        flush_work(&local->set_multicast_list_queue);
-        flush_work(&local->set_tim_queue);
+        flush_work_sync(&local->reset_queue);
+        flush_work_sync(&local->set_multicast_list_queue);
+        flush_work_sync(&local->set_tim_queue);
 #ifndef PRISM2_NO_STATION_MODES
-        flush_work(&local->info_queue);
+        flush_work_sync(&local->info_queue);
 #endif
-        flush_work(&local->comms_qual_update);
+        flush_work_sync(&local->comms_qual_update);
 
         lib80211_crypt_info_free(&local->crypt_info);
 
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index 970a48baaf8..d737091cf6a 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -3,8 +3,6 @@
 #include <linux/if_arp.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/export.h>
-#include <linux/etherdevice.h>
 #include "hostap_wlan.h"
 #include "hostap.h"
 #include "hostap_ap.h"
@@ -464,7 +462,8 @@ static void handle_info_queue_scanresults(local_info_t *local)
                 prism2_host_roaming(local);
 
         if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA &&
-            !is_zero_ether_addr(local->preferred_ap)) {
+            memcmp(local->preferred_ap, "\x00\x00\x00\x00\x00\x00",
+                   ETH_ALEN) != 0) {
                 /*
                  * Firmware seems to be getting into odd state in host_roaming
                  * mode 2 when hostscan is used without join command, so try
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index ac074731335..12de46407c7 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -5,8 +5,6 @@
 #include <linux/sched.h>
 #include <linux/ethtool.h>
 #include <linux/if_arp.h>
-#include <linux/module.h>
-#include <linux/etherdevice.h>
 #include <net/lib80211.h>
 
 #include "hostap_wlan.h"
@@ -3222,7 +3220,8 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev,
                 return -EINVAL;
 
         addr = ext->addr.sa_data;
-        if (is_broadcast_ether_addr(addr)) {
+        if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&
+            addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
                 sta_ptr = NULL;
                 crypt = &local->crypt_info.crypt[i];
         } else {
@@ -3394,7 +3393,8 @@ static int prism2_ioctl_giwencodeext(struct net_device *dev,
                 i--;
 
         addr = ext->addr.sa_data;
-        if (is_broadcast_ether_addr(addr)) {
+        if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&
+            addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
                 sta_ptr = NULL;
                 crypt = &local->crypt_info.crypt[i];
         } else {
@@ -3457,7 +3457,9 @@ static int prism2_ioctl_set_encryption(local_info_t *local,
             param->u.crypt.key_len)
                 return -EINVAL;
 
-        if (is_broadcast_ether_addr(param->sta_addr)) {
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
                 if (param->u.crypt.idx >= WEP_KEYS)
                         return -EINVAL;
                 sta_ptr = NULL;
@@ -3590,7 +3592,9 @@ static int prism2_ioctl_get_encryption(local_info_t *local,
         if (max_key_len < 0)
                 return -EINVAL;
 
-        if (is_broadcast_ether_addr(param->sta_addr)) {
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
                 sta_ptr = NULL;
                 if (param->u.crypt.idx >= WEP_KEYS)
                         param->u.crypt.idx = local->crypt_info.tx_keyidx;
@@ -3867,8 +3871,8 @@ static void prism2_get_drvinfo(struct net_device *dev,
         iface = netdev_priv(dev);
         local = iface->local;
 
-        strlcpy(info->driver, "hostap", sizeof(info->driver));
-        snprintf(info->fw_version, sizeof(info->fw_version),
+        strncpy(info->driver, "hostap", sizeof(info->driver) - 1);
+        snprintf(info->fw_version, sizeof(info->fw_version) - 1,
                  "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
                  (local->sta_fw_ver >> 8) & 0xff,
                  local->sta_fw_ver & 0xff);
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 15f0fad39ad..89a116fba1d 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -244,7 +244,8 @@ u16 hostap_tx_callback_register(local_info_t *local,
         unsigned long flags;
         struct hostap_tx_callback_info *entry;
 
-        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+        entry = kmalloc(sizeof(*entry),
+                                                           GFP_ATOMIC);
         if (entry == NULL)
                 return 0;
 
@@ -815,7 +816,7 @@ static const struct net_device_ops hostap_netdev_ops = {
         .ndo_stop               = prism2_close,
         .ndo_do_ioctl           = hostap_ioctl,
         .ndo_set_mac_address    = prism2_set_mac_address,
-        .ndo_set_rx_mode        = hostap_set_multicast_list,
+        .ndo_set_multicast_list = hostap_set_multicast_list,
         .ndo_change_mtu         = prism2_change_mtu,
         .ndo_tx_timeout         = prism2_tx_timeout,
         .ndo_validate_addr      = eth_validate_addr,
@@ -828,7 +829,7 @@ static const struct net_device_ops hostap_mgmt_netdev_ops = {
         .ndo_stop               = prism2_close,
         .ndo_do_ioctl           = hostap_ioctl,
         .ndo_set_mac_address    = prism2_set_mac_address,
-        .ndo_set_rx_mode        = hostap_set_multicast_list,
+        .ndo_set_multicast_list = hostap_set_multicast_list,
         .ndo_change_mtu         = prism2_change_mtu,
         .ndo_tx_timeout         = prism2_tx_timeout,
         .ndo_validate_addr      = eth_validate_addr,
@@ -841,7 +842,7 @@ static const struct net_device_ops hostap_master_ops = {
         .ndo_stop               = prism2_close,
         .ndo_do_ioctl           = hostap_ioctl,
         .ndo_set_mac_address    = prism2_set_mac_address,
-        .ndo_set_rx_mode        = hostap_set_multicast_list,
+        .ndo_set_multicast_list = hostap_set_multicast_list,
         .ndo_change_mtu         = prism2_change_mtu,
         .ndo_tx_timeout         = prism2_tx_timeout,
         .ndo_validate_addr      = eth_validate_addr,
@@ -1084,7 +1085,7 @@ int prism2_sta_deauth(local_info_t *local, u16 reason)
         __le16 val = cpu_to_le16(reason);
 
         if (local->iw_mode != IW_MODE_INFRA ||
-            is_zero_ether_addr(local->bssid) ||
+            memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 ||
             memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
                 return 0;
 
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 05ca3402dca..972a9c3af39 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -457,4 +457,18 @@ static struct pci_driver prism2_pci_driver = {
 #endif /* CONFIG_PM */
 };
 
-module_pci_driver(prism2_pci_driver);
+
+static int __init init_prism2_pci(void)
+{
+        return pci_register_driver(&prism2_pci_driver);
+}
+
+
+static void __exit exit_prism2_pci(void)
+{
+        pci_unregister_driver(&prism2_pci_driver);
+}
+
+
+module_init(init_prism2_pci);
+module_exit(exit_prism2_pci);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index c3d067ee4db..33e79037770 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -616,4 +616,18 @@ static struct pci_driver prism2_plx_driver = {
         .remove         = prism2_plx_remove,
 };
 
-module_pci_driver(prism2_plx_driver);
+
+static int __init init_prism2_plx(void)
+{
+        return pci_register_driver(&prism2_plx_driver);
+}
+
+
+static void __exit exit_prism2_plx(void)
+{
+        pci_unregister_driver(&prism2_plx_driver);
+}
+
+
+module_init(init_prism2_plx);
+module_exit(exit_prism2_plx);
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index dc447c1b5ab..005ff25a405 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -2,7 +2,6 @@
 
 #include <linux/types.h>
 #include <linux/proc_fs.h>
-#include <linux/export.h>
 #include <net/lib80211.h>
 
 #include "hostap_wlan.h"
@@ -58,7 +57,8 @@ static int prism2_stats_proc_read(char *page, char **start, off_t off,
 {
         char *p = page;
         local_info_t *local = (local_info_t *) data;
-        struct comm_tallies_sums *sums = &local->comm_tallies;
+        struct comm_tallies_sums *sums = (struct comm_tallies_sums *)
+                &local->comm_tallies;
 
         if (off != 0) {
                 *eof = 1;