--- zzzz-none-000/linux-4.4.60/net/ipv6/ip6_output.c	2017-04-08 07:53:53.000000000 +0000
+++ wasp-540e-714/linux-4.4.60/net/ipv6/ip6_output.c	2019-07-03 09:21:34.000000000 +0000
@@ -57,6 +57,10 @@
 #include <linux/mroute6.h>
 #include <net/l3mdev.h>
 
+#ifdef CONFIG_AVM_PA
+#include <linux/avm_pa.h>
+#endif
+
 static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
 	struct dst_entry *dst = skb_dst(skb);
@@ -333,6 +337,9 @@
 				     struct sk_buff *skb)
 {
 	skb_sender_cpu_clear(skb);
+#ifdef CONFIG_AVM_PA
+	avm_pa_mark_routed(skb);
+#endif
 	return dst_output(net, sk, skb);
 }
 
@@ -552,6 +559,9 @@
 #ifdef CONFIG_NET_SCHED
 	to->tc_index = from->tc_index;
 #endif
+#ifdef CONFIG_AVM_PA
+	memcpy(&to->avm_pa.pktinfo, &from->avm_pa.pktinfo, sizeof(from->avm_pa.pktinfo));
+#endif
 	nf_copy(to, from);
 	skb_copy_secmark(to, from);
 }