Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
4f2f6f23
Commit
4f2f6f23
authored
Apr 15, 2009
by
Jan Engelhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
netfilter: xtables: fix const inconsistency
Signed-off-by:
Jan Engelhardt
<
jengelh@medozas.de
>
parent
ccf5bd8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
net/ipv4/netfilter/ip_tables.c
net/ipv4/netfilter/ip_tables.c
+7
-7
net/ipv6/netfilter/ip6_tables.c
net/ipv6/netfilter/ip6_tables.c
+7
-7
No files found.
net/ipv4/netfilter/ip_tables.c
View file @
4f2f6f23
...
...
@@ -238,8 +238,8 @@ static struct nf_loginfo trace_loginfo = {
/* Mildly perf critical (only if packet tracing is on) */
static
inline
int
get_chainname_rulenum
(
struct
ipt_entry
*
s
,
struct
ipt_entry
*
e
,
c
har
*
hookname
,
char
**
chainname
,
char
**
comment
,
unsigned
int
*
rulenum
)
c
onst
char
*
hookname
,
const
char
**
chainname
,
c
onst
c
har
**
comment
,
unsigned
int
*
rulenum
)
{
struct
ipt_standard_target
*
t
=
(
void
*
)
ipt_get_target
(
s
);
...
...
@@ -257,8 +257,8 @@ get_chainname_rulenum(struct ipt_entry *s, struct ipt_entry *e,
&&
unconditional
(
&
s
->
ip
))
{
/* Tail of chains: STANDARD target (return/policy) */
*
comment
=
*
chainname
==
hookname
?
(
char
*
)
comments
[
NF_IP_TRACE_COMMENT_POLICY
]
:
(
char
*
)
comments
[
NF_IP_TRACE_COMMENT_RETURN
];
?
comments
[
NF_IP_TRACE_COMMENT_POLICY
]
:
comments
[
NF_IP_TRACE_COMMENT_RETURN
];
}
return
1
;
}
else
...
...
@@ -277,14 +277,14 @@ static void trace_packet(struct sk_buff *skb,
{
void
*
table_base
;
const
struct
ipt_entry
*
root
;
char
*
hookname
,
*
chainname
,
*
comment
;
c
onst
c
har
*
hookname
,
*
chainname
,
*
comment
;
unsigned
int
rulenum
=
0
;
table_base
=
private
->
entries
[
smp_processor_id
()];
root
=
get_entry
(
table_base
,
private
->
hook_entry
[
hook
]);
hookname
=
chainname
=
(
char
*
)
hooknames
[
hook
];
comment
=
(
char
*
)
comments
[
NF_IP_TRACE_COMMENT_RULE
];
hookname
=
chainname
=
hooknames
[
hook
];
comment
=
comments
[
NF_IP_TRACE_COMMENT_RULE
];
IPT_ENTRY_ITERATE
(
root
,
private
->
size
-
private
->
hook_entry
[
hook
],
...
...
net/ipv6/netfilter/ip6_tables.c
View file @
4f2f6f23
...
...
@@ -270,8 +270,8 @@ static struct nf_loginfo trace_loginfo = {
/* Mildly perf critical (only if packet tracing is on) */
static
inline
int
get_chainname_rulenum
(
struct
ip6t_entry
*
s
,
struct
ip6t_entry
*
e
,
c
har
*
hookname
,
char
**
chainname
,
char
**
comment
,
unsigned
int
*
rulenum
)
c
onst
char
*
hookname
,
const
char
**
chainname
,
c
onst
c
har
**
comment
,
unsigned
int
*
rulenum
)
{
struct
ip6t_standard_target
*
t
=
(
void
*
)
ip6t_get_target
(
s
);
...
...
@@ -289,8 +289,8 @@ get_chainname_rulenum(struct ip6t_entry *s, struct ip6t_entry *e,
&&
unconditional
(
&
s
->
ipv6
))
{
/* Tail of chains: STANDARD target (return/policy) */
*
comment
=
*
chainname
==
hookname
?
(
char
*
)
comments
[
NF_IP6_TRACE_COMMENT_POLICY
]
:
(
char
*
)
comments
[
NF_IP6_TRACE_COMMENT_RETURN
];
?
comments
[
NF_IP6_TRACE_COMMENT_POLICY
]
:
comments
[
NF_IP6_TRACE_COMMENT_RETURN
];
}
return
1
;
}
else
...
...
@@ -309,14 +309,14 @@ static void trace_packet(struct sk_buff *skb,
{
void
*
table_base
;
const
struct
ip6t_entry
*
root
;
char
*
hookname
,
*
chainname
,
*
comment
;
c
onst
c
har
*
hookname
,
*
chainname
,
*
comment
;
unsigned
int
rulenum
=
0
;
table_base
=
private
->
entries
[
smp_processor_id
()];
root
=
get_entry
(
table_base
,
private
->
hook_entry
[
hook
]);
hookname
=
chainname
=
(
char
*
)
hooknames
[
hook
];
comment
=
(
char
*
)
comments
[
NF_IP6_TRACE_COMMENT_RULE
];
hookname
=
chainname
=
hooknames
[
hook
];
comment
=
comments
[
NF_IP6_TRACE_COMMENT_RULE
];
IP6T_ENTRY_ITERATE
(
root
,
private
->
size
-
private
->
hook_entry
[
hook
],
...
...
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