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

Commit 38720352 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

gre: Use inner_proto to obtain inner header protocol 



Instead of parsing headers to determine the inner protocol we can just pull
the value from inner_proto.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e598af7

net/ipv4/gre_offload.c

+2 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
{

	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct gre_base_hdr *greh;

	u16 mac_offset = skb->mac_header;

	__be16 protocol = skb->protocol;

	u16 mac_len = skb->mac_len;
@@ -48,15 +47,13 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
	if (unlikely(!pskb_may_pull(skb, tnl_hlen)))

		goto out;



	greh = (struct gre_base_hdr *)skb_transport_header(skb);



	/* setup inner skb. */

	skb->protocol = greh->protocol;

	skb->encapsulation = 0;

	__skb_pull(skb, tnl_hlen);

	skb_reset_mac_header(skb);

	skb_set_network_header(skb, skb_inner_network_offset(skb));

	skb->mac_len = skb_inner_network_offset(skb);

	skb->protocol = skb->inner_protocol;



	need_csum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_GRE_CSUM);

	skb->encap_hdr_csum = need_csum;
@@ -75,6 +72,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
	gre_offset = outer_hlen - tnl_hlen;

	skb = segs;

	do {

		struct gre_base_hdr *greh;

		__be32 *pcsum;



		skb_reset_inner_headers(skb);