Staging: rtl8187se: Do not autoconnect based on probe response
authorSamuel Ortiz <sameo@linux.intel.com>
Fri, 9 Apr 2010 22:33:17 +0000 (00:33 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:35:54 +0000 (11:35 -0700)
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>
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c

index 2b7080cc2c0584385af17fdbdbf9746a287828fb..3a724496e74881365d9e4414f80e284630d0a1b4 100644 (file)
@@ -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);