iface: remove define for internal array size

The macro was only used inside kernel code and not relevant to
user-space anyway.

diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c
index bfcbfc59cfb0aa5068895e3657d98e6e43b93c71..c52b69444722495e04c46b222c1836fc388bfbe6 100644 (file)
--- a/extensions/xt_iface.c
+++ b/extensions/xt_iface.c
@@ -19,7 +19,7 @@ MODULE_ALIAS("ipt_iface");
 MODULE_ALIAS("ip6t_iface");
 //MODULE_ALIAS("arpt_iface");
 
-static struct xt_iface_flag_pairs xt_iface_lookup[XT_IFACE_FLAGCOUNT] =
+static struct xt_iface_flag_pairs xt_iface_lookup[] =
 {
        {.iface_flag = XT_IFACE_UP,             .iff_flag = IFF_UP},
        {.iface_flag = XT_IFACE_BROADCAST,      .iff_flag = IFF_BROADCAST},
@@ -45,7 +45,7 @@ static bool xt_iface_mt(const struct sk_buff *skb,
        dev    = dev_get_by_name(&init_net, info->ifname);
        retval = dev != NULL;
        if (retval) {
-               for (i = 0; i < XT_IFACE_FLAGCOUNT && retval; ++i) {
+               for (i = 0; i < ARRAY_SIZE(xt_iface_lookup) && retval; ++i) {
                        if (info->flags & xt_iface_lookup[i].iface_flag)
                                retval &= dev->flags & xt_iface_lookup[i].iff_flag;
                        if (info->invflags & xt_iface_lookup[i].iface_flag)

diff --git a/extensions/xt_iface.h b/extensions/xt_iface.h
index 0a460d9080a229be68e163efff39f8d1cd739c55..6a7ec0d59f909ec6e4d6bc2905a83b331e4bc29d 100644 (file)
--- a/extensions/xt_iface.h
+++ b/extensions/xt_iface.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_NETFILTER_XT_IFACE_H
 #define _LINUX_NETFILTER_XT_IFACE_H 1
 
-#define XT_IFACE_FLAGCOUNT 11
-
 enum {
        XT_IFACE_UP          = 1 << 0,
        XT_IFACE_BROADCAST   = 1 << 1,