netfilter: xtables: fix const inconsistency

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 7fcbc16dd24be25dd2f4268c12fae1f2cf2e9559..16b7c09c0366d2cef23853d41f276d5e846ae67f 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -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,
-                     char *hookname, char **chainname,
-                     char **comment, unsigned int *rulenum)
+                     const char *hookname, const char **chainname,
+                     const char **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;
+       const char *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],

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 2b52fac52a3045a2ba5d726ec53dfba53e3204dc..4853a3d542b70498c093d1d21d4a3dd3ff1bd011 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -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,
-                     char *hookname, char **chainname,
-                     char **comment, unsigned int *rulenum)
+                     const char *hookname, const char **chainname,
+                     const char **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;
+       const char *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],