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

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

Merge "udp: better wmem accounting on gso"

parents 11519948 fa5b13be

include/linux/udp.h

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct udp_sock { 
	 * when the socket is uncorked.

	 */

	__u16		 len;		/* total length of pending frames */

	__u16		 gso_size;

	/*

	 * Fields specific to UDP-Lite.

	 */
@@ -87,6 +88,8 @@ struct udp_sock { 
	int		forward_deficit;

};



#define UDP_MAX_SEGMENTS	(1 << 6UL)



static inline struct udp_sock *udp_sk(const struct sock *sk)

{

	return (struct udp_sock *)sk;

include/net/inet_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ struct inet_cork { 
	__u8			ttl;

	__s16			tos;

	char			priority;

	__u16			gso_size;

};



struct inet_cork_full {

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct ipcm_cookie { 
	__u8			ttl;

	__s16			tos;

	char			priority;

	__u16			gso_size;

};



#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))

include/net/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ struct ipcm6_cookie { 
	__s16 tclass;

	__s8  dontfrag;

	struct ipv6_txoptions *opt;

	__u16 gso_size;

};



static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)

include/uapi/linux/udp.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct udphdr { 
#define UDP_ENCAP	100	/* Set the socket to accept encapsulated packets */

#define UDP_NO_CHECK6_TX 101	/* Disable sending checksum for UDP6X */

#define UDP_NO_CHECK6_RX 102	/* Disable accpeting checksum for UDP6 */

#define UDP_SEGMENT	103	/* Set GSO segmentation size */



/* UDP encapsulation types */

#define UDP_ENCAP_ESPINUDP_NON_IKE	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */