diff --git a/[refs] b/[refs]
index 0e98e30eeb17..1d162cd0d863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f317154929f87d2fe799179761d1b639af33de74
+refs/heads/master: eff1b99a6fc8eb25913fab7cd30eaeb6ca91349a
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
index 0bb4a212dd71..8096b0f52156 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
@@ -111,7 +111,6 @@ struct wlc_bsscfg {
 	pmkid_t pmkid[MAXPMKID];	/* PMKID cache */
 	uint npmkid;		/* num cached PMKIDs */
 
-	wlc_bss_info_t *target_bss;	/* BSS parms during tran. to ASSOCIATED state */
 	wlc_bss_info_t *current_bss;	/* BSS parms in ASSOCIATED state */
 
 	/* PM states */
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index 05bcda3b3791..fc3c6ab81d2e 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -789,7 +789,7 @@ void wlc_set_home_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
 		FOREACH_BSS(wlc, idx, cfg) {
 			if (!cfg->associated)
 				continue;
-			cfg->target_bss->chanspec = chanspec;
+
 			cfg->current_bss->chanspec = chanspec;
 		}
 
@@ -3209,7 +3209,7 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
 
 			wlc->default_bss->chanspec = chspec;
 			/* wlc_BSSinit() will sanitize the rateset before using it.. */
-			if (wlc->pub->up && !wlc->pub->associated &&
+			if (wlc->pub->up &&
 			    (WLC_BAND_PI_RADIO_CHANSPEC != chspec)) {
 				wlc_set_home_chanspec(wlc, chspec);
 				wlc_suspend_mac_and_wait(wlc);