---

yaml --- r: 232888 b: refs/heads/master c: 3db7e93 h: refs/heads/master v: v3
git-mirror · Feb 1, 2011 · d7cb602 · d7cb602
1 parent a9491ae
commit d7cb602
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d0db8b6b1da9e3d4c696ef29449700c58d589db
+refs/heads/master: 3db7e93d3308fb882884b9f024235d6fbf542034
diff --git a/trunk/include/net/netfilter/nf_conntrack_ecache.h b/trunk/include/net/netfilter/nf_conntrack_ecache.h
@@ -77,9 +77,6 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
 	if (e == NULL)
 		return;
 
-	if (!(e->ctmask & (1 << event)))
-		return;
-
 	set_bit(event, &e->cache);
 }
 

diff --git a/trunk/net/netfilter/nf_conntrack_ecache.c b/trunk/net/netfilter/nf_conntrack_ecache.c
@@ -63,6 +63,9 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
 		 * this does not harm and it happens very rarely. */
 		unsigned long missed = e->missed;
 
+		if (!((events | missed) & e->ctmask))
+			goto out_unlock;
+
 		ret = notify->fcn(events | missed, &item);
 		if (unlikely(ret < 0 || missed)) {
 			spin_lock_bh(&ct->lock);
-Original file line number
+Diff line change
@@ Expand Up @@
     	if (e == NULL)
     		return;
-    	if (!(e->ctmask & (1 << event)))
-    		return;
     	set_bit(event, &e->cache);
     }
@@ Expand Down @@