--- zzzz-none-000/linux-4.4.60/net/xfrm/xfrm_input.c	2017-04-08 07:53:53.000000000 +0000
+++ honeybee-1240e-714/linux-4.4.60/net/xfrm/xfrm_input.c	2019-07-03 09:21:34.000000000 +0000
@@ -154,8 +154,8 @@
 	if (!pskb_may_pull(skb, hlen))
 		return -EINVAL;
 
-	*spi = *(__be32 *)(skb_transport_header(skb) + offset);
-	*seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
+	*spi = net_hdr_word(skb_transport_header(skb) + offset);
+	*seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
 	return 0;
 }
 
@@ -367,7 +367,7 @@
 	if (err)
 		goto drop;
 
-	nf_reset(skb);
+	nf_reset_no_generic_ct(skb);
 
 	if (decaps) {
 		skb_dst_drop(skb);