aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2010-04-10 00:33:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:35:54 -0700
commit3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7 (patch)
tree9dbb9bb0e96de9f74fec2a096775ffe48df4de4e /drivers/staging/rtl8187se
parentb46966ee8f7c75fcff9e7390d29b1f62650b0784 (diff)
downloadkernel_samsung_smdk4412-3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7.zip
kernel_samsung_smdk4412-3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7.tar.gz
kernel_samsung_smdk4412-3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7.tar.bz2
Staging: rtl8187se: 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/rtl8187se')
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
index 2b7080c..3a72449 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
@@ -1489,8 +1489,6 @@ inline void ieee80211_process_probe_response(
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,
@@ -1516,8 +1514,6 @@ inline void ieee80211_process_probe_response(
renew = 1;
//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);