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

Commit 8ebaa5b0 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move semicolon out of CALL_RXH macro 



Move the semicolon, people typically assume that and
once line already put a semicolon behind the "call".

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent de8f18d3

net/mac80211/rx.c

+17 −17
Original line number Diff line number Diff line
@@ -3201,7 +3201,7 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx, 
		res = rxh(rx);		\

		if (res != RX_CONTINUE)	\

			goto rxh_next;  \

	} while (0);

	} while (0)



	/* Lock here to avoid hitting all of the data used in the RX

	 * path (e.g. key data, station data, ...) concurrently when
@@ -3219,30 +3219,30 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx, 
		 */

		rx->skb = skb;



		CALL_RXH(ieee80211_rx_h_check_more_data)

		CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll)

		CALL_RXH(ieee80211_rx_h_sta_process)

		CALL_RXH(ieee80211_rx_h_decrypt)

		CALL_RXH(ieee80211_rx_h_defragment)

		CALL_RXH(ieee80211_rx_h_michael_mic_verify)

		CALL_RXH(ieee80211_rx_h_check_more_data);

		CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll);

		CALL_RXH(ieee80211_rx_h_sta_process);

		CALL_RXH(ieee80211_rx_h_decrypt);

		CALL_RXH(ieee80211_rx_h_defragment);

		CALL_RXH(ieee80211_rx_h_michael_mic_verify);

		/* must be after MMIC verify so header is counted in MPDU mic */

#ifdef CONFIG_MAC80211_MESH

		if (ieee80211_vif_is_mesh(&rx->sdata->vif))

			CALL_RXH(ieee80211_rx_h_mesh_fwding);

#endif

		CALL_RXH(ieee80211_rx_h_amsdu)

		CALL_RXH(ieee80211_rx_h_data)

		CALL_RXH(ieee80211_rx_h_amsdu);

		CALL_RXH(ieee80211_rx_h_data);



		/* special treatment -- needs the queue */

		res = ieee80211_rx_h_ctrl(rx, frames);

		if (res != RX_CONTINUE)

			goto rxh_next;



		CALL_RXH(ieee80211_rx_h_mgmt_check)

		CALL_RXH(ieee80211_rx_h_action)

		CALL_RXH(ieee80211_rx_h_userspace_mgmt)

		CALL_RXH(ieee80211_rx_h_action_return)

		CALL_RXH(ieee80211_rx_h_mgmt)

		CALL_RXH(ieee80211_rx_h_mgmt_check);

		CALL_RXH(ieee80211_rx_h_action);

		CALL_RXH(ieee80211_rx_h_userspace_mgmt);

		CALL_RXH(ieee80211_rx_h_action_return);

		CALL_RXH(ieee80211_rx_h_mgmt);



 rxh_next:

		ieee80211_rx_handlers_result(rx, res);
@@ -3265,10 +3265,10 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_rx_data *rx) 
		res = rxh(rx);		\

		if (res != RX_CONTINUE)	\

			goto rxh_next;  \

	} while (0);

	} while (0)



	CALL_RXH(ieee80211_rx_h_check_dup)

	CALL_RXH(ieee80211_rx_h_check)

	CALL_RXH(ieee80211_rx_h_check_dup);

	CALL_RXH(ieee80211_rx_h_check);



	ieee80211_rx_reorder_ampdu(rx, &reorder_release);