diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
| commit | 2216773fc021964a413409141d439de4f6a108f7 (patch) | |
| tree | 7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /net/netfilter/nf_conntrack_proto_gre.c | |
| parent | 42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff) | |
| parent | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_gre.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c index cf616e55ca4..d69facdd9a7 100644 --- a/net/netfilter/nf_conntrack_proto_gre.c +++ b/net/netfilter/nf_conntrack_proto_gre.c @@ -241,8 +241,8 @@ static int gre_packet(struct nf_conn *ct, nf_ct_refresh_acct(ct, ctinfo, skb, ct->proto.gre.stream_timeout); /* Also, more likely to be important, and not a probe. */ - set_bit(IPS_ASSURED_BIT, &ct->status); - nf_conntrack_event_cache(IPCT_ASSURED, ct); + if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status)) + nf_conntrack_event_cache(IPCT_ASSURED, ct); } else nf_ct_refresh_acct(ct, ctinfo, skb, ct->proto.gre.timeout); |