patch-2.4.27 linux-2.4.27/net/ipv4/ip_input.c

Next file: linux-2.4.27/net/ipv4/ip_sockglue.c
Previous file: linux-2.4.27/net/ipv4/ip_gre.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.26/net/ipv4/ip_input.c linux-2.4.27/net/ipv4/ip_input.c
@@ -226,12 +226,9 @@
 
 	__skb_pull(skb, ihl);
 
-#ifdef CONFIG_NETFILTER
 	/* Free reference early: we don't need it any more, and it may
            hold ip_conntrack module loaded indefinitely. */
-	nf_conntrack_put(skb->nfct);
-	skb->nfct = NULL;
-#endif /*CONFIG_NETFILTER*/
+	nf_reset(skb);
 
         /* Point into the IP datagram, just past the header. */
         skb->h.raw = skb->data;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)