From e05f525cbc0c26202abb82fc217d875d0cfbcb8e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 5 Jul 2012 15:42:10 +0200 Subject: [PATCH] --- yaml --- r: 311998 b: refs/heads/master c: 6bd0405bb4196b44f1acb7a58f11382cdaf6f7f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/nf_conntrack_ecache.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc328b5fd716..5b00f5fa1f17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a73f89a61f92b364f0b4a3be412b5b70553afc23 +refs/heads/master: 6bd0405bb4196b44f1acb7a58f11382cdaf6f7f0 diff --git a/trunk/include/net/netfilter/nf_conntrack_ecache.h b/trunk/include/net/netfilter/nf_conntrack_ecache.h index a88fb6939387..e1ce1048fe5f 100644 --- a/trunk/include/net/netfilter/nf_conntrack_ecache.h +++ b/trunk/include/net/netfilter/nf_conntrack_ecache.h @@ -78,7 +78,7 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) struct net *net = nf_ct_net(ct); struct nf_conntrack_ecache *e; - if (net->ct.nf_conntrack_event_cb == NULL) + if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) return; e = nf_ct_ecache_find(ct);