diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-04 01:15:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-04 01:15:48 +0200 |
| commit | 9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch) | |
| tree | e4f27485a0669871a6e331b6daf64157bec4447a /include/net | |
| parent | r8169: enable napi on resume. (diff) | |
| parent | netfilter: xt_CT: remove a compile warning (diff) | |
| download | linux-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.xz linux-9b461783d3d49c74665b55b8ae1b7a1c038177a9.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/xt_log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h index 7e1544e8f70d..9d9756cca013 100644 --- a/include/net/netfilter/xt_log.h +++ b/include/net/netfilter/xt_log.h @@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m) if (likely(m != &emergency)) kfree(m); else { - xchg(&emergency_ptr, m); + emergency_ptr = m; local_bh_enable(); } } |