iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: remove unused argument of ieee80211_get_tdls_action()

Browse Source 
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>
This commit is contained in:
Dmitry Antipov 2023-10-04 18:30:29 +03:00 committed by Johannes Berg
parent 35b9281fb7
commit 89141f9653
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/ieee80211.h
View File

@ -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) * 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 * @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 * This function assumes the frame is a data frame, and that the network header
* is in the correct place. * 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) && if (!skb_is_nonlinear(skb) &&
skb->len > (skb_network_offset(skb) + 2)) { skb->len > (skb_network_offset(skb) + 2)) {

5
net/mac80211/status.c
View File

@ -731,12 +731,9 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
if (!sdata) { if (!sdata) {
skb->dev = NULL; skb->dev = NULL;
} else if (!dropped) { } else if (!dropped) {
unsigned int hdr_size =
ieee80211_hdrlen(hdr->frame_control);
/* Check to see if packet is a TDLS teardown packet */ /* Check to see if packet is a TDLS teardown packet */
if (ieee80211_is_data(hdr->frame_control) && if (ieee80211_is_data(hdr->frame_control) &&
(ieee80211_get_tdls_action(skb, hdr_size) == (ieee80211_get_tdls_action(skb) ==
WLAN_TDLS_TEARDOWN)) { WLAN_TDLS_TEARDOWN)) {
ieee80211_tdls_td_tx_handle(local, sdata, skb, ieee80211_tdls_td_tx_handle(local, sdata, skb,
info->flags); info->flags);