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 | |
| parent | cff4c16296754888b6fd8c886bc860a888e20257 (diff) | |
| parent | 44b52bccf855b0706de624c29fc3d82ca954bb4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/xt_set.h | 4 | ||||
| -rw-r--r-- | include/net/netfilter/xt_log.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h index c0405ac92870..e3a9978f259f 100644 --- a/include/linux/netfilter/xt_set.h +++ b/include/linux/netfilter/xt_set.h | |||
| @@ -58,8 +58,8 @@ struct xt_set_info_target_v1 { | |||
| 58 | struct xt_set_info_target_v2 { | 58 | struct xt_set_info_target_v2 { |
| 59 | struct xt_set_info add_set; | 59 | struct xt_set_info add_set; |
| 60 | struct xt_set_info del_set; | 60 | struct xt_set_info del_set; |
| 61 | u32 flags; | 61 | __u32 flags; |
| 62 | u32 timeout; | 62 | __u32 timeout; |
| 63 | }; | 63 | }; |
| 64 | 64 | ||
| 65 | #endif /*_XT_SET_H*/ | 65 | #endif /*_XT_SET_H*/ |
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 | } |