diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-19 16:00:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-19 16:00:04 -0700 |
| commit | 0344f1c66b544609e867bd24aa7bfa789dfa9830 (patch) | |
| tree | 7f76abc095a90f7ad475417495d3d4f577080ae1 /net/ipv4/netfilter | |
| parent | dad9b335c6940de2746a9788eb456d09cf102f81 (diff) | |
| parent | ef3a62d272f033989e83eb1f26505f93f93e3e69 (diff) | |
| download | lwn-0344f1c66b544609e867bd24aa7bfa789dfa9830.tar.gz lwn-0344f1c66b544609e867bd24aa7bfa789dfa9830.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/tx.c
Diffstat (limited to 'net/ipv4/netfilter')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index 04578593e100..d2a887fc8d9b 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -556,7 +556,6 @@ static void nf_nat_cleanup_conntrack(struct nf_conn *ct) spin_lock_bh(&nf_nat_lock); hlist_del_rcu(&nat->bysource); - nat->ct = NULL; spin_unlock_bh(&nf_nat_lock); } @@ -570,8 +569,8 @@ static void nf_nat_move_storage(void *new, void *old) return; spin_lock_bh(&nf_nat_lock); - hlist_replace_rcu(&old_nat->bysource, &new_nat->bysource); new_nat->ct = ct; + hlist_replace_rcu(&old_nat->bysource, &new_nat->bysource); spin_unlock_bh(&nf_nat_lock); } |