diff --git a/[refs] b/[refs] index 76fc33e0cccb..885a2fabb962 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b46966ee8f7c75fcff9e7390d29b1f62650b0784 +refs/heads/master: 3eec314fb26fc0e75c6f5d20f9b3d528ebf342d7 diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c index 2b7080cc2c05..3a724496e748 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +++ b/trunk/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);