summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8192e/ieee80211
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2010-06-10 16:54:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-22 14:46:19 -0700
commit3ec64b05711e402f20cf30e44d83146c864738db (patch)
tree1a3f6d77cd73128648dbaac0b4bd5b69d3d4ae63 /drivers/staging/rtl8192e/ieee80211
parentae67b584b40883cf63492b9df2b06c035da84780 (diff)
Staging: rtl8192e: Do not autoconnect based on probe response
Getting a probe response after sending a probe request to a specific SSID doesnt mean we're trying to associate with this SSID. wpa_supplicant should be the only one deciding when to join an SSID, not the kernel. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211')
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
index da10067485e3..d33ed64048a2 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
@@ -2793,8 +2793,6 @@ static inline void ieee80211_process_probe_response(
#endif
memcpy(target, &network, sizeof(*target));
list_add_tail(&target->list, &ieee->network_list);
- if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
- ieee80211_softmac_new_net(ieee,&network);
} else {
IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",
escape_essid(target->ssid,
@@ -2821,8 +2819,6 @@ static inline void ieee80211_process_probe_response(
//YJ,add,080819,for hidden ap,end
update_network(target, &network);
- if(renew && (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE))
- ieee80211_softmac_new_net(ieee,&network);
}
spin_unlock_irqrestore(&ieee->lock, flags);