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

Commit 62ae67be authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: remove encrypt parameter from ieee80211_tx_skb 



Since the flags moved into skb->cb, there's no
longer a need to have the encrypt bool passed
into the function, anyone who requires it set
to 0 (false) can just set the flag directly.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 875405a7

net/mac80211/agg-rx.c

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

	ieee80211_tx_skb(sdata, skb);

}



void ieee80211_process_addba_request(struct ieee80211_local *local,

net/mac80211/agg-tx.c

+3 −2
Original line number Diff line number Diff line
@@ -91,7 +91,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, 1);

	ieee80211_tx_skb(sdata, skb);

}



void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn)
@@ -120,7 +120,8 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 
	bar->control = cpu_to_le16(bar_control);

	bar->start_seq_num = cpu_to_le16(ssn);



	ieee80211_tx_skb(sdata, skb, 0);

	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	ieee80211_tx_skb(sdata, skb);

}



static int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,

net/mac80211/ht.c

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

	ieee80211_tx_skb(sdata, skb);

}



void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,

net/mac80211/ibss.c

+2 −1
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 
	printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n",

	       sdata->dev->name, resp->da);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */

	ieee80211_tx_skb(sdata, skb, 0);

	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	ieee80211_tx_skb(sdata, skb);

}



static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,

net/mac80211/ieee80211_i.h

+1 −2
Original line number Diff line number Diff line
@@ -1015,8 +1015,7 @@ void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int ke 
				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp);

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata);

void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

		      int encrypt);

void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);

void ieee802_11_parse_elems(u8 *start, size_t len,

			    struct ieee802_11_elems *elems);

u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,