2 files changed, 5 insertions, 3 deletions

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 4e73e5708e70..21515d4c49eb 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -575,7 +575,7 @@ static int esp_init_state(struct xfrm_state *x)
                               crypto_aead_ivsize(aead);
         if (x->props.mode == XFRM_MODE_TUNNEL)
                 x->props.header_len += sizeof(struct iphdr);
-        else if (x->props.mode == XFRM_MODE_BEET)
+        else if (x->props.mode == XFRM_MODE_BEET && x->sel.family != AF_INET6)
                 x->props.header_len += IPV4_BEET_PHMAXLEN;
         if (x->encap) {
                 struct xfrm_encap_tmpl *encap = x->encap;
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 9c798abce736..63418185f524 100644
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -47,8 +47,10 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
         if (unlikely(optlen))
                 hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
 
-        skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len -
-                                    hdrlen);
+        skb_set_network_header(skb, -x->props.header_len -
+                                    hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph)));
+        if (x->sel.family != AF_INET6)
+                skb->network_header += IPV4_BEET_PHMAXLEN;
         skb->mac_header = skb->network_header +
                           offsetof(struct iphdr, protocol);
         skb->transport_header = skb->network_header + sizeof(*top_iph);