aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-03 19:15:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-03 19:15:48 -0400
commit9b461783d3d49c74665b55b8ae1b7a1c038177a9 (patch)
treee4f27485a0669871a6e331b6daf64157bec4447a /include
parentcff4c16296754888b6fd8c886bc860a888e20257 (diff)
parent44b52bccf855b0706de624c29fc3d82ca954bb4e (diff)
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/xt_set.h4
-rw-r--r--include/net/netfilter/xt_log.h2
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 {
struct xt_set_info_target_v2 {
struct xt_set_info add_set;
struct xt_set_info del_set;
- u32 flags;
- u32 timeout;
+ __u32 flags;
+ __u32 timeout;
};
#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)
if (likely(m != &emergency))
kfree(m);
else {
- xchg(&emergency_ptr, m);
+ emergency_ptr = m;
local_bh_enable();
}
}

Privacy Policy