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

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

Merge "udp: add udp gso"

parents fab7895c 42d65f06

include/linux/skbuff.h

+2 −0
Original line number Diff line number Diff line
@@ -570,6 +570,8 @@ enum { 
	SKB_GSO_ESP = 1 << 15,



	SKB_GSO_UDP = 1 << 16,



	SKB_GSO_UDP_L4 = 1 << 17,

};



#if BITS_PER_LONG > 32

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ struct sk_buff *ip_make_skb(struct sock *sk, struct flowi4 *fl4, 
					int len, int odd, struct sk_buff *skb),

			    void *from, int length, int transhdrlen,

			    struct ipcm_cookie *ipc, struct rtable **rtp,

			    unsigned int flags);

			    struct inet_cork *cork, unsigned int flags);



static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)

{

include/net/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk, 
			     void *from, int length, int transhdrlen,

			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

			     struct rt6_info *rt, unsigned int flags,

			     struct inet_cork_full *cork,

			     const struct sockcm_cookie *sockc);



static inline struct sk_buff *ip6_finish_skb(struct sock *sk)

include/net/udp.h

+4 −0
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ struct sk_buff **udp_gro_receive(struct sk_buff **head, struct sk_buff *skb, 
				 struct udphdr *uh, udp_lookup_t lookup);

int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup);



struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,

				  netdev_features_t features,

				  unsigned int mss, __sum16 check);



static inline struct udphdr *udp_gro_udphdr(struct sk_buff *skb)

{

	struct udphdr *uh;

net/core/skbuff.c

+2 −0
Original line number Diff line number Diff line
@@ -4895,6 +4895,8 @@ unsigned int skb_gso_transport_seglen(const struct sk_buff *skb) 
		thlen = tcp_hdrlen(skb);

	} else if (unlikely(shinfo->gso_type & SKB_GSO_SCTP)) {

		thlen = sizeof(struct sctphdr);

	} else if (shinfo->gso_type & SKB_GSO_UDP_L4) {

		thlen = sizeof(struct udphdr);

	}

	/* UFO sets gso_size to the size of the fragmentation

	 * payload, i.e. the size of the L4 (UDP) header is already