diff --git a/[refs] b/[refs] index 2a6895b33476..9bc1a71bca95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b30cdfc517b06f5d3f7a5e90626931140b2caece +refs/heads/master: df44205455773852a6af10a7c6ed768fe8a86b31 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index f35eaea98e73..28d8bd53bd3a 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -1898,6 +1898,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, control->flags |= IEEE80211_TXCTL_SHORT_PREAMBLE; control->antenna_sel_tx = local->hw.conf.antenna_sel_tx; control->flags |= IEEE80211_TXCTL_NO_ACK; + control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT; control->retry_limit = 1; control->flags |= IEEE80211_TXCTL_CLEAR_PS_FILT; }