net/netfilter/xt_tables: Remove duplicate of xt_prefix
Subsystems (2)
PATCH 1/1 net/netfilter/xt_tables: Remove duplicate of xt_prefix
Remove xt_proto_prefix array which duplicates xt_prefix and change all users of xt_proto_prefix to xt_prefix.
The fix ist compile-tested on i386.
Signed-off-by Tobias Klauser <[email protected]>
--- net/netfilter/x_tables.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-)
net/netfilter/x_tables.c +10 -16
@@ -56,8 +56,8 @@ enum { };static const char *xt_prefix[NPROTO ] = { - [AF_INET ] ="ip" , - [AF_INET6 ] ="ip6" , + [AF_INET ] ="ip" , + [AF_INET6 ] ="ip6" , [NF_ARP ] ="arp" , };
@@ -651,12 +651,6 @@ void *xt_unregister_table(struct xt_table *table)EXPORT_SYMBOL_GPL (xt_unregister_table);#ifdef CONFIG_PROC_FS -static char *xt_proto_prefix[NPROTO ] = { - [AF_INET ] ="ip" , - [AF_INET6 ] ="ip6" , - [NF_ARP ] ="arp" , -}; -static struct list_head *xt_get_idx (struct list_head *list,struct seq_file *seq,loff_t pos) {struct list_head *head = list->next;
@@ -798,7 +792,7 @@ int xt_proto_init(int af)#ifdef CONFIG_PROC_FS -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_TABLES ,sizeof (buf)); proc =proc_net_fops_create (buf,0440 , &xt_file_ops);if (!proc)
@@ -806,14 +800,14 @@ int xt_proto_init(int af) proc->data = (void *) ((unsigned long ) af | (TABLE <<16 )); -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_MATCHES ,sizeof (buf)); proc =proc_net_fops_create (buf,0440 , &xt_file_ops);if (!proc) goto out_remove_tables; proc->data = (void *) ((unsigned long ) af | (MATCH <<16 )); -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_TARGETS ,sizeof (buf)); proc =proc_net_fops_create (buf,0440 , &xt_file_ops);if (!proc)
@@ -825,12 +819,12 @@ int xt_proto_init(int af)#ifdef CONFIG_PROC_FS out_remove_matches: -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_MATCHES ,sizeof (buf));proc_net_remove (buf); out_remove_tables: -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_TABLES ,sizeof (buf));proc_net_remove (buf); out:
@@ -844,15 +838,15 @@ void xt_proto_fini(int af)#ifdef CONFIG_PROC_FS char buf[XT_FUNCTION_MAXNAMELEN ]; -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_TABLES ,sizeof (buf));proc_net_remove (buf); -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_TARGETS ,sizeof (buf));proc_net_remove (buf); -strlcpy (buf, xt_proto_prefix[af],sizeof (buf)); +strlcpy (buf, xt_prefix[af],sizeof (buf));strlcat (buf,FORMAT_MATCHES ,sizeof (buf));proc_net_remove (buf);#endif /*CONFIG_PROC_FS*/
Signature · 1 line
1.4.4.2