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

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

mac80211: move and rename misc tx handler 



This TX handler is used only for assigning the
station pointer in the control information, so
give it a better name. Also move it before rate
control.

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

net/mac80211/tx.c

+12 −12
Original line number Diff line number Diff line
@@ -559,6 +559,17 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) 
	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_sta(struct ieee80211_tx_data *tx)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);



	if (tx->sta)

		info->control.sta = &tx->sta->sta;



	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)

{
@@ -733,17 +744,6 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx) 
	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);



	if (tx->sta)

		info->control.sta = &tx->sta->sta;



	return TX_CONTINUE;

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)

{
@@ -1292,10 +1292,10 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx) 
	CALL_TXH(ieee80211_tx_h_check_assoc);

	CALL_TXH(ieee80211_tx_h_ps_buf);

	CALL_TXH(ieee80211_tx_h_select_key);

	CALL_TXH(ieee80211_tx_h_sta);

	CALL_TXH(ieee80211_tx_h_michael_mic_add);

	if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))

		CALL_TXH(ieee80211_tx_h_rate_ctrl);

	CALL_TXH(ieee80211_tx_h_misc);

	CALL_TXH(ieee80211_tx_h_sequence);

	CALL_TXH(ieee80211_tx_h_fragment);

	/* handlers after fragment must be aware of tx info fragmentation! */