Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/wireless/mlme.c

 /*
  * cfg80211 MLME SAP interface
  *
  * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/nl80211.h>
@@ skipping 131 matching lines @@
 
 void __cfg80211_send_deauth(struct net_device *dev,
                                    const u8 *buf, size_t len)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct wiphy *wiphy = wdev->wiphy;
         struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
         struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
         const u8 *bssid = mgmt->bssid;
         int i;
-        bool found = false, was_current = false;
+        bool found = false;
 
         ASSERT_WDEV_LOCK(wdev);
 
         if (wdev->current_bss &&
             memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
                 cfg80211_unhold_bss(wdev->current_bss);
                 cfg80211_put_bss(&wdev->current_bss->pub);
                 wdev->current_bss = NULL;
                 found = true;
-                was_current = true;
         } else for (i = 0; i < MAX_AUTH_BSSES; i++) {
                 if (wdev->auth_bsses[i] &&
                     memcmp(wdev->auth_bsses[i]->pub.bssid, bssid, ETH_ALEN) == 0) {
                         cfg80211_unhold_bss(wdev->auth_bsses[i]);
                         cfg80211_put_bss(&wdev->auth_bsses[i]->pub);
                         wdev->auth_bsses[i] = NULL;
                         found = true;
                         break;
                 }
                 if (wdev->authtry_bsses[i] &&
                     memcmp(wdev->authtry_bsses[i]->pub.bssid, bssid, ETH_ALEN) == 0) {
                         cfg80211_unhold_bss(wdev->authtry_bsses[i]);
                         cfg80211_put_bss(&wdev->authtry_bsses[i]->pub);
                         wdev->authtry_bsses[i] = NULL;
                         found = true;
                         break;
                 }
         }
 
         if (!found)
                 return;
 
         nl80211_send_deauth(rdev, dev, buf, len, GFP_KERNEL);
 
-        if (wdev->sme_state == CFG80211_SME_CONNECTED && was_current) {
+        if (wdev->sme_state == CFG80211_SME_CONNECTED) {

[Sam Leffler, 2010/12/01 00:23:44]

not sure about these changes

                 u16 reason_code;
                 bool from_ap;
 
                 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
                 from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
                 __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
         } else if (wdev->sme_state == CFG80211_SME_CONNECTING) {
                 __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
                                           WLAN_STATUS_UNSPECIFIED_FAILURE,
@@ skipping 742 matching lines @@
                                  gfp_t gfp)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct wiphy *wiphy = wdev->wiphy;
         struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
 
         /* Indicate roaming trigger event to user space */
         nl80211_send_cqm_bitrate_notify(rdev, dev, bitrate, gfp);
 }
 EXPORT_SYMBOL(cfg80211_cqm_bitrate_notify);