redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

hifive-unleashed-5.1
David S. Miller 2012-04-03 19:15:48 -04:00
parent cff4c16296 44b52bccf8
commit 9b461783d3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/netfilter/xt_set.h
View File

@ -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*/

2
include/net/netfilter/xt_log.h
View File

@ -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();
} }
} }

2
net/netfilter/xt_CT.c
View File

@ -281,8 +281,10 @@ out:
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: