summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-06-20 23:50:59 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-06-24 15:59:20 +0200
commit6c7c4cbfd5f59c04a40af67ad72d14e19215ef36 (patch)
treed3877b220f167e2f25c6863c4bfb12dcccb9287f /net
parentac49e1a8969eeb819c4fc2eced9ee9ef9f35a4a9 (diff)
downloadblackbird-obmc-linux-6c7c4cbfd5f59c04a40af67ad72d14e19215ef36.tar.gz
blackbird-obmc-linux-6c7c4cbfd5f59c04a40af67ad72d14e19215ef36.zip
mac80211: initialize power mode for mesh STAs
Previously the default mesh STA nonpeer power mode was UNKNOWN (0) make the default mesh STA power mode ACTIVE, to prevent unnecessary frame buffering while peering is not yet complete. Fixes a panic in ath9k_htc when adding stations from userspace, and mcast buffered frames are later released. Thanks to Bob Copeland for his help debugging this. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/sta_info.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index aaf68d297221..aeb967a0aeed 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -347,6 +347,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
if (ieee80211_vif_is_mesh(&sdata->vif) &&
!sdata->u.mesh.user_mpm)
init_timer(&sta->plink_timer);
+ sta->nonpeer_pm = NL80211_MESH_POWER_ACTIVE;
#endif
memcpy(sta->sta.addr, addr, ETH_ALEN);
OpenPOWER on IntegriCloud