diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-03 19:15:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-03 19:15:48 -0400 |
| commit | 9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch) | |
| tree | e4f27485a0669871a6e331b6daf64157bec4447a /include/net | |
| parent | cff4c16296754888b6fd8c886bc860a888e20257 (diff) | |
| parent | 44b52bccf855b0706de624c29fc3d82ca954bb4e (diff) | |
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) | |||
| 47 | if (likely(m != &emergency)) | 47 | if (likely(m != &emergency)) |
| 48 | kfree(m); | 48 | kfree(m); |
| 49 | else { | 49 | else { |
| 50 | xchg(&emergency_ptr, m); | 50 | emergency_ptr = m; |
| 51 | local_bh_enable(); | 51 | local_bh_enable(); |
| 52 | } | 52 | } |
| 53 | } | 53 | } |