From ce99e7ac33d99fcfff834d85869604e4aebf5ec6 Mon Sep 17 00:00:00 2001 From: Sukesh Srikakula Date: Mon, 8 Aug 2011 15:58:10 +0200 Subject: [PATCH] --- yaml --- r: 267413 b: refs/heads/master c: bf4c4f434d473e63e87b2b0b4f86d52079764df0 h: refs/heads/master i: 267411: 66bcea7af5208640feed3194ab15785a16f64b50 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 9b2a884a925d..e757d0803ac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aed2ee1ff0afa95e487a0ac4c0f165e85de23c7b +refs/heads/master: bf4c4f434d473e63e87b2b0b4f86d52079764df0 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index a915b6e409e5..2e8fd6e7052e 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -1420,11 +1420,6 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, goto done; } - brcmf_update_prof(cfg_priv, NULL, sme->bssid, WL_PROF_BSSID); - /* - ** Join with specific BSSID and cached SSID - ** If SSID is zero join based on BSSID only - */ memset(&join_params, 0, sizeof(join_params)); join_params_size = sizeof(join_params.ssid); @@ -1433,10 +1428,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, join_params.ssid.SSID_len = cpu_to_le32(join_params.ssid.SSID_len); brcmf_update_prof(cfg_priv, NULL, &join_params.ssid, WL_PROF_SSID); - if (sme->bssid) - memcpy(join_params.params.bssid, sme->bssid, ETH_ALEN); - else - memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN); + memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN); if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) { WL_CONN("ssid \"%s\", len (%d)\n",