From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Jan 2018 18:49:06 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.16-rc1~123^2~74
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5ca114400dcd46f19f31573e7c60e638bd8d644b;p=users%2Fjedix%2Flinux-maple.git
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
5ca114400dcd46f19f31573e7c60e638bd8d644b
diff --cc net/ipv4/esp4_offload.c
index 32fbd9ba36090,29b333a62ab01..da5635fc52c22
--- a/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@@ -116,8 -120,13 +116,11 @@@ static struct sk_buff *esp4_gso_segment
struct xfrm_offload *xo = xfrm_offload(skb);
if (!xo)
- goto out;
+ return ERR_PTR(-EINVAL);
+ if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
- goto out;
-
- seq = xo->seq.low;
++ return ERR_PTR(-EINVAL);
+
x = skb->sp->xvec[skb->sp->len - 1];
aead = x->data;
esph = ip_esp_hdr(skb);
diff --cc net/ipv6/esp6_offload.c
index 44d109c435bc8,f52c314d4c970..3fd1ec775dc25
--- a/net/ipv6/esp6_offload.c
+++ b/net/ipv6/esp6_offload.c
@@@ -143,8 -147,13 +143,11 @@@ static struct sk_buff *esp6_gso_segment
struct xfrm_offload *xo = xfrm_offload(skb);
if (!xo)
- goto out;
+ return ERR_PTR(-EINVAL);
+ if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
- goto out;
-
- seq = xo->seq.low;
++ return ERR_PTR(-EINVAL);
+
x = skb->sp->xvec[skb->sp->len - 1];
aead = x->data;
esph = ip_esp_hdr(skb);