---

yaml --- r: 2426 b: refs/heads/master c: 2715bcf h: refs/heads/master v: v3
git-mirror · Jun 21, 2005 · 4cf00d3 · 4cf00d3
1 parent d44f318
commit 4cf00d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6150bacfec95c7042678667561664efcf10d4508
+refs/heads/master: 2715bcf9efc34063e05009f188eb896c462ae925
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
@@ -184,6 +184,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
 					raw_rcv(last, skb2);
 			}
 			last = sk;
+			nf_reset(skb);
 		}
 	}
 

diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
@@ -1350,6 +1350,7 @@ int ip_mr_input(struct sk_buff *skb)
 			     */
 			    read_lock(&mrt_lock);
 			    if (mroute_socket) {
+				    nf_reset(skb);
 				    raw_rcv(mroute_socket, skb);
 				    read_unlock(&mrt_lock);
 				    return 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,6 +184,7 @@ int ip_call_ra_chain(struct sk_buff *skb) @@
     					raw_rcv(last, skb2);
     			}
     			last = sk;
+    			nf_reset(skb);
     		}
     	}
@@ Expand Down @@