On Mon, May 10, 2010 at 10:18:11PM +0200, kaber@xxxxxxxxx wrote: > From: Jan Engelhardt <jengelh@xxxxxxxxxx> > > Semantic patch: > // <smpl> > @@ > @@ > IP_VS_XMIT( > -PF_INET6, > +NFPROTO_IPV6, > ...) > > @@ > @@ > IP_VS_XMIT( > -PF_INET, > +NFPROTO_IPV4, > ...) > // </smpl> > > Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx> FWIW Acked-by: Simon Horman <horms@xxxxxxxxxxxx> > --- > net/netfilter/ipvs/ip_vs_xmit.c | 16 ++++++++-------- > 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 223b501..d0a7b7b 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; > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
