iface: remove define for internal array size

The macro was only used inside kernel code and not relevant to
user-space anyway.
This commit is contained in:
Jan Engelhardt
2009-04-26 22:07:43 +02:00
parent 6d8ce3acae
commit 3f96deb0f0
2 changed files with 2 additions and 4 deletions

View File

@@ -19,7 +19,7 @@ MODULE_ALIAS("ipt_iface");
MODULE_ALIAS("ip6t_iface"); MODULE_ALIAS("ip6t_iface");
//MODULE_ALIAS("arpt_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_UP, .iff_flag = IFF_UP},
{.iface_flag = XT_IFACE_BROADCAST, .iff_flag = IFF_BROADCAST}, {.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); dev = dev_get_by_name(&init_net, info->ifname);
retval = dev != NULL; retval = dev != NULL;
if (retval) { 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) if (info->flags & xt_iface_lookup[i].iface_flag)
retval &= dev->flags & xt_iface_lookup[i].iff_flag; retval &= dev->flags & xt_iface_lookup[i].iff_flag;
if (info->invflags & xt_iface_lookup[i].iface_flag) if (info->invflags & xt_iface_lookup[i].iface_flag)

View File

@@ -1,8 +1,6 @@
#ifndef _LINUX_NETFILTER_XT_IFACE_H #ifndef _LINUX_NETFILTER_XT_IFACE_H
#define _LINUX_NETFILTER_XT_IFACE_H 1 #define _LINUX_NETFILTER_XT_IFACE_H 1
#define XT_IFACE_FLAGCOUNT 11
enum { enum {
XT_IFACE_UP = 1 << 0, XT_IFACE_UP = 1 << 0,
XT_IFACE_BROADCAST = 1 << 1, XT_IFACE_BROADCAST = 1 << 1,