Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9b461783
Commit
9b461783
authored
Apr 03, 2012
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://1984.lsi.us.es/net
parents
cff4c162
44b52bcc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
include/linux/netfilter/xt_set.h
include/linux/netfilter/xt_set.h
+2
-2
include/net/netfilter/xt_log.h
include/net/netfilter/xt_log.h
+1
-1
net/netfilter/xt_CT.c
net/netfilter/xt_CT.c
+2
-0
No files found.
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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment