Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: chromeos/compat-wireless/net/wireless/mlme.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/compat-wireless/net/wireless/mlme.c
diff --git a/chromeos/compat-wireless/net/wireless/mlme.c b/chromeos/compat-wireless/net/wireless/mlme.c
index b93501f4f7027b08efdda484373e963727fe3fab..638ab261bc46412535570e7269737c7008ec375c 100644
--- a/chromeos/compat-wireless/net/wireless/mlme.c
+++ b/chromeos/compat-wireless/net/wireless/mlme.c
@@ -149,7 +149,7 @@ void __cfg80211_send_deauth(struct net_device *dev,
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);
@@ -159,7 +159,6 @@ void __cfg80211_send_deauth(struct net_device *dev,
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) {
@@ -184,7 +183,7 @@ void __cfg80211_send_deauth(struct net_device *dev,
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;

Powered by Google App Engine
This is Rietveld 408576698