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 | |
parent | cff4c16296754888b6fd8c886bc860a888e20257 (diff) | |
parent | 44b52bccf855b0706de624c29fc3d82ca954bb4e (diff) | |
download | linux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.gz linux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.tar.bz2 linux-3.10-9b461783d3d49c74665b55b8ae1b7a1c038177a9.zip |
Merge branch 'master' of git://1984.lsi.us.es/net
-rw-r--r-- | include/linux/netfilter/xt_set.h | 4 | ||||
-rw-r--r-- | include/net/netfilter/xt_log.h | 2 | ||||
-rw-r--r-- | net/netfilter/xt_CT.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h index c0405ac9287..e3a9978f259 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 7e1544e8f70..9d9756cca01 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(); } } diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 0c8e43810ce..138b75e41fd 100644 --- a/net/netfilter/xt_CT.c +++ b/net/netfilter/xt_CT.c @@ -281,8 +281,10 @@ out: info->ct = ct; return 0; +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT err4: rcu_read_unlock(); +#endif err3: nf_conntrack_free(ct); err2: |