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

Commit 84f2004d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "udp: Complement partial checksum for GSO packet"

parents ba1b87fd 1cc0e6ee

Documentation/networking/netdev-features.txt

+7 −0
Original line number Diff line number Diff line
@@ -113,6 +113,13 @@ whatever headers there might be. 
NETIF_F_TSO_ECN means that hardware can properly split packets with CWR bit

set, be it TCPv4 (when NETIF_F_TSO is enabled) or TCPv6 (NETIF_F_TSO6).



 * Transmit UDP segmentation offload



NETIF_F_GSO_UDP_GSO_L4 accepts a single UDP header with a payload that exceeds

gso_size. On segmentation, it segments the payload on gso_size boundaries and

replicates the network and UDP headers (fixing up the last one if less than

gso_size).



 * Transmit DMA from high memory



On platforms where this is relevant, NETIF_F_HIGHDMA signals that

include/linux/netdev_features.h

+4 −1
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ enum { 
	NETIF_F_GSO_SCTP_BIT,		/* ... SCTP fragmentation */

	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_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_UDP_BIT,

		NETIF_F_GSO_UDP_L4_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CRC_BIT,		/* SCTP checksum offload */
@@ -142,6 +143,7 @@ enum { 
#define NETIF_F_HW_ESP		__NETIF_F(HW_ESP)

#define NETIF_F_HW_ESP_TX_CSUM	__NETIF_F(HW_ESP_TX_CSUM)

#define	NETIF_F_RX_UDP_TUNNEL_PORT  __NETIF_F(RX_UDP_TUNNEL_PORT)

#define NETIF_F_GSO_UDP_L4	__NETIF_F(GSO_UDP_L4)



#define for_each_netdev_feature(mask_addr, bit)	\

	for_each_set_bit(bit, (unsigned long *)mask_addr, NETDEV_FEATURE_COUNT)
@@ -211,6 +213,7 @@ enum { 
				 NETIF_F_GSO_GRE_CSUM |			\

				 NETIF_F_GSO_IPXIP4 |			\

				 NETIF_F_GSO_IPXIP6 |			\

				 NETIF_F_GSO_UDP_L4 |			\

				 NETIF_F_GSO_UDP_TUNNEL |		\

				 NETIF_F_GSO_UDP_TUNNEL_CSUM)

include/linux/netdevice.h

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

	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));



	return (features & feature) == feature;

}

include/net/udp.h

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ int udp_abort(struct sock *sk, int err); 
int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);

int udp_push_pending_frames(struct sock *sk);

void udp_flush_pending_frames(struct sock *sk);

int udp_cmsg_send(struct sock *sk, struct msghdr *msg, u16 *gso_size);

void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst);

int udp_rcv(struct sk_buff *skb);

int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);

net/core/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[NETIF_F_GSO_PARTIAL_BIT] =	 "tx-gso-partial",

	[NETIF_F_GSO_SCTP_BIT] =	 "tx-sctp-segmentation",

	[NETIF_F_GSO_ESP_BIT] =		 "tx-esp-segmentation",

	[NETIF_F_GSO_UDP_L4_BIT] =	 "tx-udp-segmentation",



	[NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",

	[NETIF_F_SCTP_CRC_BIT] =        "tx-checksum-sctp",