diff options
| author |   Jouni Malinen <j@w1.fi> | 2009-01-08 13:32:07 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:06 -0500 |
| commit | 1acc97b63a3f32481ebbb4e831323e9aa8834f66 (patch) | |
| tree | 35c636422e196b1f778d0564abe101e43fc19976 /net/mac80211/mesh_hwmp.c | |
| parent | mac80211: 802.11w - SA Query processing (diff) | |
| download | linux-dev-1acc97b63a3f32481ebbb4e831323e9aa8834f66.tar.xz linux-dev-1acc97b63a3f32481ebbb4e831323e9aa8834f66.zip | |
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_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 71fe60961230..3f1785c1bacb 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -149,7 +149,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags, pos += ETH_ALEN; memcpy(pos, &dst_dsn, 4); - ieee80211_tx_skb(sdata, skb, 0); + ieee80211_tx_skb(sdata, skb, 1); return 0; } @@ -198,7 +198,7 @@ int mesh_path_error_tx(u8 *dst, __le32 dst_dsn, u8 *ra, pos += ETH_ALEN; memcpy(pos, &dst_dsn, 4); - ieee80211_tx_skb(sdata, skb, 0); + ieee80211_tx_skb(sdata, skb, 1); return 0; } |