diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-12 19:36:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-12 19:36:33 -0700 |
| commit | f403ede70518c131ba8bebbacaf182927a58a315 (patch) | |
| tree | 93acb9ce082a97d53edef7c5894614b8fa016759 /net/mac80211/tx.c | |
| parent | 5dc474d6b3ba19df7d491d4eabd9fb7a0c1c2423 (diff) | |
| parent | a4278e18e7e497b76781492d010035c3c36f7403 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f35eaea98e7..28d8bd53bd3 100644 --- a/net/mac80211/tx.c +++ b/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; } |