Commit 76a853f8 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: free SKBTX_WIFI_STATUS skb tx_flags flag 



Jason mentioned at netdevconf that we've run out of tx_flags in
the skb_shinfo(). Gain one bit back by removing the wifi bit.

We can do that because the only userspace application for it
(hostapd) doesn't change the setting on the socket, it just
uses different sockets, and normally doesn't even use this any
more, sending the frames over nl80211 instead.

Reviewed-by: default avatarJason Xing <kerneljasonxing@gmail.com>
Link: https://patch.msgid.link/20250313134942.52ff54a140ec.If390bbdc46904cf451256ba989d7a056c457af6e@changeid


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

drivers/net/wireless/ath/wil6210/txrx.h

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef WIL6210_TXRX_H

#define WIL6210_TXRX_H



#include <net/sock.h>

#include "wil6210.h"

#include "txrx_edma.h"
@@ -617,7 +618,7 @@ static inline bool wil_need_txstat(struct sk_buff *skb) 
	const u8 *da = wil_skb_get_da(skb);



	return is_unicast_ether_addr(da) && skb->sk &&

	       (skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS);

	       sock_flag(skb->sk, SOCK_WIFI_STATUS);

}



static inline void wil_consume_skb(struct sk_buff *skb, bool acked)

drivers/net/wireless/marvell/mwifiex/main.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/suspend.h>

#include <net/sock.h>



#include "main.h"

#include "wmm.h"
@@ -939,7 +940,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	multicast = is_multicast_ether_addr(skb->data);



	if (unlikely(!multicast && skb->sk &&

		     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS &&

		     sock_flag(skb->sk, SOCK_WIFI_STATUS) &&

		     priv->adapter->fw_api_ver == MWIFIEX_FW_V15))

		skb = mwifiex_clone_skb_for_tx_status(priv,

						      skb,

include/linux/skbuff.h

+0 −3
Original line number Diff line number Diff line
@@ -481,9 +481,6 @@ enum { 
	/* generate software time stamp on packet tx completion */

	SKBTX_COMPLETION_TSTAMP = 1 << 3,



	/* generate wifi status information (where possible) */

	SKBTX_WIFI_STATUS = 1 << 4,



	/* determine hardware time stamp based on time or cycles */

	SKBTX_HW_TSTAMP_NETDEV = 1 << 5,

include/net/sock.h

+0 −2
Original line number Diff line number Diff line
@@ -2736,8 +2736,6 @@ static inline void _sock_tx_timestamp(struct sock *sk, 
				*tskey = atomic_inc_return(&sk->sk_tskey) - 1;

		}

	}

	if (unlikely(sock_flag(sk, SOCK_WIFI_STATUS)))

		*tx_flags |= SKBTX_WIFI_STATUS;

}



static inline void sock_tx_timestamp(struct sock *sk,

net/mac80211/mesh.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/slab.h>

#include <linux/unaligned.h>

#include <net/sock.h>

#include "ieee80211_i.h"

#include "mesh.h"

#include "wme.h"
@@ -776,7 +777,7 @@ bool ieee80211_mesh_xmit_fast(struct ieee80211_sub_if_data *sdata, 
	if (ethertype < ETH_P_802_3_MIN)

		return false;



	if (skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)

	if (skb->sk && sock_flag(skb->sk, SOCK_WIFI_STATUS))

		return false;



	if (skb->ip_summed == CHECKSUM_PARTIAL) {