1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 0c5fb81451b..9fc19400b85 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -88,11 +88,12 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
         tail[clen-skb->len - 2] = (clen - skb->len) - 2;
         pskb_put(skb, trailer, clen - skb->len);
 
-        top_iph = (struct ipv6hdr *)__skb_push(skb, hdr_len);
+        __skb_push(skb, -skb_network_offset(skb));
+        top_iph = ipv6_hdr(skb);
         esph = (struct ipv6_esp_hdr *)skb_transport_header(skb);
         top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph));
-        *(skb_tail_pointer(trailer) - 1) = *skb_network_header(skb);
-        *skb_network_header(skb) = IPPROTO_ESP;
+        *(skb_tail_pointer(trailer) - 1) = *skb_mac_header(skb);
+        *skb_mac_header(skb) = IPPROTO_ESP;
 
         esph->spi = x->id.spi;
         esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq);