netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4: ip_input.c ipmr.c

[pluto]

Author: pluto
Date: Wed Jun 22 14:45:54 2005
New Revision: 6168

Modified:
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ip_input.c
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ipmr.c
Log:
- drop reference before handing packets to raw_rcv
  to avoid module unload problems (Patrick McHardy).


Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ip_input.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ip_input.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ip_input.c	Wed Jun 22 14:45:54 2005
@@ -184,6 +184,7 @@
 					raw_rcv(last, skb2);
 			}
 			last = sk;
+			nf_reset(skb);
 		}
 	}
 

Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ipmr.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ipmr.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/ipmr.c	Wed Jun 22 14:45:54 2005
@@ -1350,6 +1350,7 @@
 			     */
 			    read_lock(&mrt_lock);
 			    if (mroute_socket) {
+				    nf_reset(skb);
 				    raw_rcv(mroute_socket, skb);
 				    read_unlock(&mrt_lock);
 				    return 0;