Commit 89141f96 authored Oct 04, 2023 by Dmitry Antipov Committed by Johannes Berg Oct 23, 2023

wifi: remove unused argument of ieee80211_get_tdls_action()



Remove unused 'hdr_size' argument of 'ieee80211_get_tdls_action()'
and adjust 'ieee80211_report_used_skb()' accordingly.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://lore.kernel.org/r/20231004153032.206134-1-dmantipov@yandex.ru


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 35b9281f

include/linux/ieee80211.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -4490,12 +4490,11 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
		/**
		* ieee80211_get_tdls_action - get tdls packet action (or -1, if not tdls packet)
		* @skb: the skb containing the frame, length will not be checked
		* @hdr_size: the size of the ieee80211_hdr that starts at skb->data
		*
		* This function assumes the frame is a data frame, and that the network header
		* is in the correct place.
		*/
		static inline int ieee80211_get_tdls_action(struct sk_buff *skb, u32 hdr_size)
		static inline int ieee80211_get_tdls_action(struct sk_buff *skb)
		{
		if (!skb_is_nonlinear(skb) &&
		skb->len > (skb_network_offset(skb) + 2)) {

net/mac80211/status.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -731,12 +731,9 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
		if (!sdata) {
		skb->dev = NULL;
		} else if (!dropped) {
		unsigned int hdr_size =
		ieee80211_hdrlen(hdr->frame_control);

		/* Check to see if packet is a TDLS teardown packet */
		if (ieee80211_is_data(hdr->frame_control) &&
		(ieee80211_get_tdls_action(skb, hdr_size) ==
		(ieee80211_get_tdls_action(skb) ==
		WLAN_TDLS_TEARDOWN)) {
		ieee80211_tdls_td_tx_handle(local, sdata, skb,
		info->flags);