Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 5c876450b14cf569e76582919489ab6a992c4621..98c0b5e56ecc02e50a754dd0b77303dac9b6160c 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -511,6 +511,7 @@ static int ieee80211_stop(struct net_device *dev)
        case IEEE80211_IF_TYPE_STA:
        case IEEE80211_IF_TYPE_IBSS:
                sdata->u.sta.state = IEEE80211_DISABLED;
+               memset(sdata->u.sta.bssid, 0, ETH_ALEN);
                del_timer_sync(&sdata->u.sta.timer);
                /*
                 * When we get here, the interface is marked down.