aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-08 06:32:07 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:00:06 -0500
commit1acc97b63a3f32481ebbb4e831323e9aa8834f66 (patch)
tree35c636422e196b1f778d0564abe101e43fc19976 /net/mac80211
parentfea147328908b7e2bfcaf9dc4377909d5507ca35 (diff)
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')
-rw-r--r--net/mac80211/ht.c6
-rw-r--r--net/mac80211/mesh_hwmp.c4
-rw-r--r--net/mac80211/mesh_plink.c2
-rw-r--r--net/mac80211/spectmgmt.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 832adf888ac3..6be485264236 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -202,7 +202,7 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
202 mgmt->u.action.u.addba_req.start_seq_num = 202 mgmt->u.action.u.addba_req.start_seq_num =
203 cpu_to_le16(start_seq_num << 4); 203 cpu_to_le16(start_seq_num << 4);
204 204
205 ieee80211_tx_skb(sdata, skb, 0); 205 ieee80211_tx_skb(sdata, skb, 1);
206} 206}
207 207
208static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *da, u16 tid, 208static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *da, u16 tid,
@@ -248,7 +248,7 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d
248 mgmt->u.action.u.addba_resp.timeout = cpu_to_le16(timeout); 248 mgmt->u.action.u.addba_resp.timeout = cpu_to_le16(timeout);
249 mgmt->u.action.u.addba_resp.status = cpu_to_le16(status); 249 mgmt->u.action.u.addba_resp.status = cpu_to_le16(status);
250 250
251 ieee80211_tx_skb(sdata, skb, 0); 251 ieee80211_tx_skb(sdata, skb, 1);
252} 252}
253 253
254static void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, 254static void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
@@ -291,7 +291,7 @@ static void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
291 mgmt->u.action.u.delba.params = cpu_to_le16(params); 291 mgmt->u.action.u.delba.params = cpu_to_le16(params);
292 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code); 292 mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);
293 293
294 ieee80211_tx_skb(sdata, skb, 0); 294 ieee80211_tx_skb(sdata, skb, 1);
295} 295}
296 296
297void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn) 297void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn)
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,
149 pos += ETH_ALEN; 149 pos += ETH_ALEN;
150 memcpy(pos, &dst_dsn, 4); 150 memcpy(pos, &dst_dsn, 4);
151 151
152 ieee80211_tx_skb(sdata, skb, 0); 152 ieee80211_tx_skb(sdata, skb, 1);
153 return 0; 153 return 0;
154} 154}
155 155
@@ -198,7 +198,7 @@ int mesh_path_error_tx(u8 *dst, __le32 dst_dsn, u8 *ra,
198 pos += ETH_ALEN; 198 pos += ETH_ALEN;
199 memcpy(pos, &dst_dsn, 4); 199 memcpy(pos, &dst_dsn, 4);
200 200
201 ieee80211_tx_skb(sdata, skb, 0); 201 ieee80211_tx_skb(sdata, skb, 1);
202 return 0; 202 return 0;
203} 203}
204 204
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,
218 memcpy(pos, &reason, 2); 218 memcpy(pos, &reason, 2);
219 } 219 }
220 220
221 ieee80211_tx_skb(sdata, skb, 0); 221 ieee80211_tx_skb(sdata, skb, 1);
222 return 0; 222 return 0;
223} 223}
224 224
diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c
index 22ad4808e01a..8396b5a77e8d 100644
--- a/net/mac80211/spectmgmt.c
+++ b/net/mac80211/spectmgmt.c
@@ -65,7 +65,7 @@ static void ieee80211_send_refuse_measurement_request(struct ieee80211_sub_if_da
65 IEEE80211_SPCT_MSR_RPRT_MODE_REFUSED; 65 IEEE80211_SPCT_MSR_RPRT_MODE_REFUSED;
66 msr_report->u.action.u.measurement.msr_elem.type = request_ie->type; 66 msr_report->u.action.u.measurement.msr_elem.type = request_ie->type;
67 67
68 ieee80211_tx_skb(sdata, skb, 0); 68 ieee80211_tx_skb(sdata, skb, 1);
69} 69}
70 70
71void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, 71void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,