Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1acc97b6 authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

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: default avatarJouni Malinen <jouni.malinen@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fea14732

net/mac80211/ht.c

+3 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata, 
	mgmt->u.action.u.addba_req.start_seq_num =

					cpu_to_le16(start_seq_num << 4);



	ieee80211_tx_skb(sdata, skb, 0);

	ieee80211_tx_skb(sdata, skb, 1);

}



static 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 
	mgmt->u.action.u.addba_resp.timeout = cpu_to_le16(timeout);

	mgmt->u.action.u.addba_resp.status = cpu_to_le16(status);



	ieee80211_tx_skb(sdata, skb, 0);

	ieee80211_tx_skb(sdata, skb, 1);

}



static 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, 
	mgmt->u.action.u.delba.params = cpu_to_le16(params);

	mgmt->u.action.u.delba.reason_code = cpu_to_le16(reason_code);



	ieee80211_tx_skb(sdata, skb, 0);

	ieee80211_tx_skb(sdata, skb, 1);

}



void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn)

net/mac80211/mesh_hwmp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

net/mac80211/mesh_plink.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

net/mac80211/spectmgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void ieee80211_send_refuse_measurement_request(struct ieee80211_sub_if_da 
			IEEE80211_SPCT_MSR_RPRT_MODE_REFUSED;

	msr_report->u.action.u.measurement.msr_elem.type = request_ie->type;



	ieee80211_tx_skb(sdata, skb, 0);

	ieee80211_tx_skb(sdata, skb, 1);

}



void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,