summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh_plink.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-08 14:32:07 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-01-30 00:00:06 +0300
commit1acc97b63a3f32481ebbb4e831323e9aa8834f66 (patch)
tree35c636422e196b1f778d0564abe101e43fc19976 /net/mac80211/mesh_plink.c
parentfea147328908b7e2bfcaf9dc4377909d5507ca35 (diff)
downloadlinux-1acc97b63a3f32481ebbb4e831323e9aa8834f66.tar.xz
mac80211: 802.11w - Do not force Action frames to disable encryption
When sending out Action frames, allow ieee80211_tx_skb() to send them without enforcing do_not_encrypt. These frames will be encrypted if MFP has been negotiated. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_plink.c')
-rw-r--r--net/mac80211/mesh_plink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 1159bdb4119c..8a6c02ba1620 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -218,7 +218,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
memcpy(pos, &reason, 2);
}
- ieee80211_tx_skb(sdata, skb, 0);
+ ieee80211_tx_skb(sdata, skb, 1);
return 0;
}