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

Commit e1f9bf07 authored by Steffen Klassert's avatar Steffen Klassert Committed by Greg Kroah-Hartman
Browse files

BACKPORT: net: Add fraglist GRO/GSO feature flags 



This adds new Fraglist GRO/GSO feature flags. They will be used
to configure fraglist GRO/GSO what will be implemented with some
followup paches.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

Bug: 167707933
Change-Id: I65a4b9fc631c88cd20c1b101fee70e864c2c4502
(cherry picked from commit 3b33583265ed3b0ae76eddbabf9d038b4076d1a9)
[hyunsoon: removed patch in net/ethtool/common.c which is not in android branch]
Signed-off-by: default avatarHyunsoon Kim <h10.kim@samsung.com>
parent a81a6940

include/linux/netdev_features.h

+5 −1
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ enum { 
	NETIF_F_GSO_ESP_BIT,		/* ... ESP with TSO */

	NETIF_F_GSO_UDP_BIT,		/* ... UFO, deprecated except tuntap */

	NETIF_F_GSO_UDP_L4_BIT,		/* ... UDP payload GSO (not UFO) */

	NETIF_F_GSO_FRAGLIST_BIT,		/* ... Fraglist GSO */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_UDP_L4_BIT,

		NETIF_F_GSO_FRAGLIST_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CRC_BIT,		/* SCTP checksum offload */
@@ -80,6 +81,7 @@ enum { 


	NETIF_F_GRO_HW_BIT,		/* Hardware Generic receive offload */

	NETIF_F_HW_TLS_RECORD_BIT,	/* Offload TLS record */

	NETIF_F_GRO_FRAGLIST_BIT,	/* Fraglist GRO */



	/*

	 * Add your fresh new feature above and remember to update
@@ -150,6 +152,8 @@ enum { 
#define NETIF_F_GSO_UDP_L4	__NETIF_F(GSO_UDP_L4)

#define NETIF_F_HW_TLS_TX	__NETIF_F(HW_TLS_TX)

#define NETIF_F_HW_TLS_RX	__NETIF_F(HW_TLS_RX)

#define NETIF_F_GRO_FRAGLIST	__NETIF_F(GRO_FRAGLIST)

#define NETIF_F_GSO_FRAGLIST	__NETIF_F(GSO_FRAGLIST)



/* Finds the next feature with the highest number of the range of start till 0.

 */

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -4572,6 +4572,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_ESP != (NETIF_F_GSO_ESP >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP != (NETIF_F_GSO_UDP >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_L4 != (NETIF_F_GSO_UDP_L4 >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_FRAGLIST != (NETIF_F_GSO_FRAGLIST >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

}

include/linux/skbuff.h

+2 −0
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ enum { 
	SKB_GSO_UDP = 1 << 16,



	SKB_GSO_UDP_L4 = 1 << 17,



	SKB_GSO_FRAGLIST = 1 << 18,

};



#if BITS_PER_LONG > 32