--- zzzz-none-000/linux-3.10.107/net/xfrm/xfrm_policy.c	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/net/xfrm/xfrm_policy.c	2021-11-10 11:53:56.000000000 +0000
@@ -13,6 +13,12 @@
  *
  */
 
+/**
+ * Some part of this file is modified by Ikanos Communications. 
+ *
+ * Copyright (C) 2013-2014 Ikanos Communications.
+ */
+
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>
@@ -1357,6 +1363,18 @@
 
 }
 
+#if IS_ENABLED(CONFIG_FUSIV_KERNEL_AP_2_AP)
+#if IS_ENABLED(CONFIG_IPSEC_AP_SUPPORT) && IS_ENABLED(CONFIG_L2TP_AP_SUPPORT)
+int xfrm_tmpl_resolve_wrapper(struct xfrm_policy **pols, int npols, const struct flowi *fl,
+                                        struct xfrm_state **xfrm, unsigned short family)
+{
+
+        return xfrm_tmpl_resolve (pols, npols, fl, xfrm, family);
+}
+
+#endif
+#endif
+
 /* Check that the bundle accepts the flow and its components are
  * still valid.
  */
@@ -1810,7 +1828,7 @@
 			continue;
 		}
 
-		nf_reset(skb);
+		nf_reset_no_generic_ct(skb);
 		skb_dst_drop(skb);
 		skb_dst_set(skb, dst);
 
@@ -3256,3 +3274,9 @@
 }
 EXPORT_SYMBOL(xfrm_migrate);
 #endif
+
+#if IS_ENABLED(CONFIG_FUSIV_KERNEL_AP_2_AP)
+#if IS_ENABLED(CONFIG_IPSEC_AP_SUPPORT) && IS_ENABLED(CONFIG_L2TP_AP_SUPPORT)
+EXPORT_SYMBOL(xfrm_tmpl_resolve_wrapper);
+#endif
+#endif