1 files changed, 8 insertions, 8 deletions
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 223b5018c7d..d0a7b7b05dd 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -269,7 +269,7 @@ ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -333,7 +333,7 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET6, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -409,7 +409,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -485,7 +485,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET6, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -784,7 +784,7 @@ ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -837,7 +837,7 @@ ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET6, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
        LeaveFunction(10);
        return NF_STOLEN;
@@ -911,7 +911,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
        rc = NF_STOLEN;
        goto out;
@@ -986,7 +986,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
        /* Another hack: avoid icmp_send in ip_fragment */
        skb->local_df = 1;
-        IP_VS_XMIT(PF_INET6, skb, rt);
+        IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
        rc = NF_STOLEN;
        goto out;

diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index 223b5018c7d..d0a7b7b05dd 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -269,7 +269,7 @@ ip_vs_bypass_xmit(struct sk_buff skb, struct ip_vs_conn cp,
269	/* Another hack: avoid icmp_send in ip_fragment */	269	/* Another hack: avoid icmp_send in ip_fragment */
270	skb->local_df = 1;	270	skb->local_df = 1;
271		271
272	IP_VS_XMIT(PF_INET, skb, rt);	272	IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
273		273
274	LeaveFunction(10);	274	LeaveFunction(10);
275	return NF_STOLEN;	275	return NF_STOLEN;
@@ -333,7 +333,7 @@ ip_vs_bypass_xmit_v6(struct sk_buff skb, struct ip_vs_conn cp,
333	/* Another hack: avoid icmp_send in ip_fragment */	333	/* Another hack: avoid icmp_send in ip_fragment */
334	skb->local_df = 1;	334	skb->local_df = 1;
335		335
336	IP_VS_XMIT(PF_INET6, skb, rt);	336	IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
337		337
338	LeaveFunction(10);	338	LeaveFunction(10);
339	return NF_STOLEN;	339	return NF_STOLEN;
@@ -409,7 +409,7 @@ ip_vs_nat_xmit(struct sk_buff skb, struct ip_vs_conn cp,
409	/* Another hack: avoid icmp_send in ip_fragment */	409	/* Another hack: avoid icmp_send in ip_fragment */
410	skb->local_df = 1;	410	skb->local_df = 1;
411		411
412	IP_VS_XMIT(PF_INET, skb, rt);	412	IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
413		413
414	LeaveFunction(10);	414	LeaveFunction(10);
415	return NF_STOLEN;	415	return NF_STOLEN;
@@ -485,7 +485,7 @@ ip_vs_nat_xmit_v6(struct sk_buff skb, struct ip_vs_conn cp,
485	/* Another hack: avoid icmp_send in ip_fragment */	485	/* Another hack: avoid icmp_send in ip_fragment */
486	skb->local_df = 1;	486	skb->local_df = 1;
487		487
488	IP_VS_XMIT(PF_INET6, skb, rt);	488	IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
489		489
490	LeaveFunction(10);	490	LeaveFunction(10);
491	return NF_STOLEN;	491	return NF_STOLEN;
@@ -784,7 +784,7 @@ ip_vs_dr_xmit(struct sk_buff skb, struct ip_vs_conn cp,
784	/* Another hack: avoid icmp_send in ip_fragment */	784	/* Another hack: avoid icmp_send in ip_fragment */
785	skb->local_df = 1;	785	skb->local_df = 1;
786		786
787	IP_VS_XMIT(PF_INET, skb, rt);	787	IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
788		788
789	LeaveFunction(10);	789	LeaveFunction(10);
790	return NF_STOLEN;	790	return NF_STOLEN;
@@ -837,7 +837,7 @@ ip_vs_dr_xmit_v6(struct sk_buff skb, struct ip_vs_conn cp,
837	/* Another hack: avoid icmp_send in ip_fragment */	837	/* Another hack: avoid icmp_send in ip_fragment */
838	skb->local_df = 1;	838	skb->local_df = 1;
839		839
840	IP_VS_XMIT(PF_INET6, skb, rt);	840	IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
841		841
842	LeaveFunction(10);	842	LeaveFunction(10);
843	return NF_STOLEN;	843	return NF_STOLEN;
@@ -911,7 +911,7 @@ ip_vs_icmp_xmit(struct sk_buff skb, struct ip_vs_conn cp,
911	/* Another hack: avoid icmp_send in ip_fragment */	911	/* Another hack: avoid icmp_send in ip_fragment */
912	skb->local_df = 1;	912	skb->local_df = 1;
913		913
914	IP_VS_XMIT(PF_INET, skb, rt);	914	IP_VS_XMIT(NFPROTO_IPV4, skb, rt);
915		915
916	rc = NF_STOLEN;	916	rc = NF_STOLEN;
917	goto out;	917	goto out;
@@ -986,7 +986,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff skb, struct ip_vs_conn cp,
986	/* Another hack: avoid icmp_send in ip_fragment */	986	/* Another hack: avoid icmp_send in ip_fragment */
987	skb->local_df = 1;	987	skb->local_df = 1;
988		988
989	IP_VS_XMIT(PF_INET6, skb, rt);	989	IP_VS_XMIT(NFPROTO_IPV6, skb, rt);
990		990
991	rc = NF_STOLEN;	991	rc = NF_STOLEN;
992	goto out;	992	goto out;