diff --git a/[refs] b/[refs] index 432582ab338c..7d454663879b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77bbadd5ea893f364a0d1879723037678a03725c +refs/heads/master: 56a6d13dfd49d90d72a1a962246206719dd9d143 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 35eb767cbcbe..acb04133a95d 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -3299,6 +3299,7 @@ void ieee80211_start_mesh(struct net_device *dev) ifsta = &sdata->u.sta; ifsta->state = IEEE80211_MESH_UP; ieee80211_sta_timer((unsigned long)sdata); + ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON); } #endif