Skip to content

L
linux
Commit 9b461783 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'master' of git://1984.lsi.us.es/net

parents cff4c162 44b52bcc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
include/linux/netfilter/xt_set.h
View file @ 9b461783
...@@ -58,8 +58,8 @@ struct xt_set_info_target_v1 { ...@@ -58,8 +58,8 @@ struct xt_set_info_target_v1 {
struct xt_set_info_target_v2 { struct xt_set_info_target_v2 {
struct xt_set_info add_set; struct xt_set_info add_set;
struct xt_set_info del_set; struct xt_set_info del_set;
u32 flags; __u32 flags;
u32 timeout; __u32 timeout;
}; };
#endif /*_XT_SET_H*/ #endif /*_XT_SET_H*/
include/net/netfilter/xt_log.h
View file @ 9b461783
...@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m) ...@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)
if (likely(m != &emergency)) if (likely(m != &emergency))
kfree(m); kfree(m);
else { else {
xchg(&emergency_ptr, m); emergency_ptr = m;
local_bh_enable(); local_bh_enable();
} }
} }
......
net/netfilter/xt_CT.c
View file @ 9b461783
...@@ -281,8 +281,10 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) ...@@ -281,8 +281,10 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
info->ct = ct; info->ct = ct;
return 0; return 0;
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
err4: err4:
rcu_read_unlock(); rcu_read_unlock();
#endif
err3: err3:
nf_conntrack_free(ct); nf_conntrack_free(ct);
err2: err2:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7