Attachment 145159 Details for Bug 220149 – remove __ip_vs_conn_put(cp)

[patch] remove __ip_vs_conn_put(cp)

ip_vs_xmit.c.patch (text/plain), 2.07 KB, created by saveline on 2007-01-09 13:33:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: saveline

Created: 2007-01-09 13:33:21 UTC

Size: 2.07 KB

patch

obsolete

>--- ip_vs_xmit.c.2.6.9	2004-10-18 23:55:28.000000000 +0200
>+++ ip_vs_xmit.c.2.6.15	2007-01-09 14:16:39.000000000 +0100
>@@ -52,6 +52,7 @@
> 	if ((dst->obsolete || rtos != dest->dst_rtos) &&
> 	    dst->ops->check(dst, cookie) == NULL) {
> 		dest->dst_cache = NULL;
>+		dst_release(dst);
> 		return NULL;
> 	}
> 	dst_hold(dst);
>@@ -126,8 +127,7 @@
> 
> #define IP_VS_XMIT(skb, rt)				\
> do {							\
>-	nf_reset_debug(skb);				\
>-	(skb)->nfcache |= NFC_IPVS_PROPERTY;		\
>+	(skb)->ipvs_property = 1;			\
> 	(skb)->ip_summed = CHECKSUM_NONE;		\
> 	NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, (skb), NULL,	\
> 		(rt)->u.dst.dev, dst_output);		\
>@@ -177,7 +177,7 @@
> 	}
> 
> 	/* MTU checking */
>-	mtu = dst_pmtu(&rt->u.dst);
>+	mtu = dst_mtu(&rt->u.dst);
> 	if ((skb->len > mtu) && (iph->frag_off&__constant_htons(IP_DF))) {
> 		ip_rt_put(rt);
> 		icmp_send(skb, ICMP_DEST_UNREACH,ICMP_FRAG_NEEDED, htonl(mtu));
>@@ -244,7 +244,7 @@
> 		goto tx_error_icmp;
> 
> 	/* MTU checking */
>-	mtu = dst_pmtu(&rt->u.dst);
>+	mtu = dst_mtu(&rt->u.dst);
> 	if ((skb->len > mtu) && (iph->frag_off&__constant_htons(IP_DF))) {
> 		ip_rt_put(rt);
> 		icmp_send(skb, ICMP_DEST_UNREACH,ICMP_FRAG_NEEDED, htonl(mtu));
>@@ -341,7 +341,7 @@
> 
> 	tdev = rt->u.dst.dev;
> 
>-	mtu = dst_pmtu(&rt->u.dst) - sizeof(struct iphdr);
>+	mtu = dst_mtu(&rt->u.dst) - sizeof(struct iphdr);
> 	if (mtu < 68) {
> 		ip_rt_put(rt);
> 		IP_VS_DBG_RL("ip_vs_tunnel_xmit(): mtu less than 68\n");
>@@ -444,7 +444,7 @@
> 		goto tx_error_icmp;
> 
> 	/* MTU checking */
>-	mtu = dst_pmtu(&rt->u.dst);
>+	mtu = dst_mtu(&rt->u.dst);
> 	if ((iph->frag_off&__constant_htons(IP_DF)) && skb->len > mtu) {
> 		icmp_send(skb, ICMP_DEST_UNREACH,ICMP_FRAG_NEEDED, htonl(mtu));
> 		ip_rt_put(rt);
>@@ -507,7 +507,6 @@
> 			rc = NF_ACCEPT;
> 		/* do not touch skb anymore */
> 		atomic_inc(&cp->in_pkts);
>-		__ip_vs_conn_put(cp);
> 		goto out;
> 	}
> 
>@@ -519,7 +518,7 @@
> 		goto tx_error_icmp;
> 
> 	/* MTU checking */
>-	mtu = dst_pmtu(&rt->u.dst);
>+	mtu = dst_mtu(&rt->u.dst);
> 	if ((skb->len > mtu) && (skb->nh.iph->frag_off&__constant_htons(IP_DF))) {
> 		ip_rt_put(rt);
> 		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

Actions: View | Diff

Attachments on bug 220149: 145159