Commit eb6fba75 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: skbuff: hide wifi_acked when CONFIG_WIRELESS not set 



Datacenter kernel builds will very likely not include WIRELESS,
so let them shave 2 bits off the skb by hiding the wifi fields.

Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4edd97fb

include/linux/skbuff.h

+11 −0
Original line number Diff line number Diff line
@@ -953,8 +953,10 @@ struct sk_buff { 


	__u8			l4_hash:1;

	__u8			sw_hash:1;

#ifdef CONFIG_WIRELESS

	__u8			wifi_acked_valid:1;

	__u8			wifi_acked:1;

#endif

	__u8			no_fcs:1;

	/* Indicates the inner headers are valid in the skbuff. */

	__u8			encapsulation:1;
@@ -1187,6 +1189,15 @@ static inline unsigned int skb_napi_id(const struct sk_buff *skb) 
#endif

}



static inline bool skb_wifi_acked_valid(const struct sk_buff *skb)

{

#ifdef CONFIG_WIRELESS

	return skb->wifi_acked_valid;

#else

	return 0;

#endif

}



/**

 * skb_unref - decrement the skb's reference count

 * @skb: buffer

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -2697,7 +2697,7 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) 
	else

		sock_write_timestamp(sk, kt);



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

	if (sock_flag(sk, SOCK_WIFI_STATUS) && skb_wifi_acked_valid(skb))

		__sock_recv_wifi_status(msg, sk, skb);

}

net/core/skbuff.c

+2 −0
Original line number Diff line number Diff line
@@ -5189,6 +5189,7 @@ void skb_tstamp_tx(struct sk_buff *orig_skb, 
}

EXPORT_SYMBOL_GPL(skb_tstamp_tx);



#ifdef CONFIG_WIRELESS

void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)

{

	struct sock *sk = skb->sk;
@@ -5214,6 +5215,7 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) 
		kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(skb_complete_wifi_ack);

#endif /* CONFIG_WIRELESS */



/**

 * skb_partial_csum_set - set up and verify partial csum values for packet

net/socket.c

+2 −0
Original line number Diff line number Diff line
@@ -957,6 +957,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, 
}

EXPORT_SYMBOL_GPL(__sock_recv_timestamp);



#ifdef CONFIG_WIRELESS

void __sock_recv_wifi_status(struct msghdr *msg, struct sock *sk,

	struct sk_buff *skb)

{
@@ -972,6 +973,7 @@ void __sock_recv_wifi_status(struct msghdr *msg, struct sock *sk, 
	put_cmsg(msg, SOL_SOCKET, SCM_WIFI_STATUS, sizeof(ack), &ack);

}

EXPORT_SYMBOL_GPL(__sock_recv_wifi_status);

#endif



static inline void sock_recv_drops(struct msghdr *msg, struct sock *sk,

				   struct sk_buff *skb)