[NET]: Use ARRAY_SIZE where appropriate.

net/bridge/br_netfilter.c

@@ -620,13 +620,11 @@ static struct nf_hook_ops br_nf_ops[] = {
 	  .priority = NF_IP_PRI_FIRST, },
 };
 
-#define NUMHOOKS (sizeof(br_nf_ops)/sizeof(br_nf_ops[0]))
-
 int br_netfilter_init(void)
 {
 	int i;
 
-	for (i = 0; i < NUMHOOKS; i++) {
+	for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) {
 		int ret;
 
 		if ((ret = nf_register_hook(&br_nf_ops[i])) >= 0)
@@ -647,6 +645,6 @@ void br_netfilter_fini(void)
 {
 	int i;
 
-	for (i = NUMHOOKS - 1; i >= 0; i--)
+	for (i = ARRAY_SIZE(br_nf_ops) - 1; i >= 0; i--)
 		nf_unregister_hook(&br_nf_ops[i]);
 }

net/bridge/netfilter/ebtable_filter.c

@@ -98,7 +98,7 @@ static int __init init(void)
 	ret = ebt_register_table(&frame_filter);
 	if (ret < 0)
 		return ret;
-	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(ebt_ops_filter); i++)
 		if ((ret = nf_register_hook(&ebt_ops_filter[i])) < 0)
 			goto cleanup;
 	return ret;
@@ -113,7 +113,7 @@ static void __exit fini(void)
 {
 	int i;
 
-	for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(ebt_ops_filter); i++)
 		nf_unregister_hook(&ebt_ops_filter[i]);
 	ebt_unregister_table(&frame_filter);
 }

net/bridge/netfilter/ebtable_nat.c

@@ -10,6 +10,7 @@
 
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/module.h>
+
 #define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
    (1 << NF_BR_POST_ROUTING))
 
@@ -104,7 +105,7 @@ static int __init init(void)
 	ret = ebt_register_table(&frame_nat);
 	if (ret < 0)
 		return ret;
-	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(ebt_ops_nat); i++)
 		if ((ret = nf_register_hook(&ebt_ops_nat[i])) < 0)
 			goto cleanup;
 	return ret;
@@ -119,7 +120,7 @@ static void __exit fini(void)
 {
 	int i;
 
-	for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(ebt_ops_nat); i++)
 		nf_unregister_hook(&ebt_ops_nat[i]);
 	ebt_unregister_table(&frame_nat);
 }

net/decnet/dn_dev.c

@@ -273,7 +273,7 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
 
 	memcpy(t, &dn_dev_sysctl, sizeof(*t));
 
-	for(i = 0; i < (sizeof(t->dn_dev_vars)/sizeof(t->dn_dev_vars[0]) - 1); i++) {
+	for(i = 0; i < ARRAY_SIZE(t->dn_dev_vars) - 1; i++) {
 		long offset = (long)t->dn_dev_vars[i].data;
 		t->dn_dev_vars[i].data = ((char *)parms) + offset;
 		t->dn_dev_vars[i].de = NULL;

net/ipv4/devinet.c

@@ -1302,9 +1302,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,
 	if (!t)
 		return;
 	memcpy(t, &devinet_sysctl, sizeof(*t));
-	for (i = 0;
-	     i < sizeof(t->devinet_vars) / sizeof(t->devinet_vars[0]) - 1;
-	     i++) {
+	for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) {
 		t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf;
 		t->devinet_vars[i].de = NULL;
 	}

net/ipv4/netfilter/ip_conntrack_ftp.c

@@ -301,7 +301,7 @@ static int help(struct sk_buff *skb,
 	array[2] = (ntohl(ct->tuplehash[dir].tuple.src.ip) >> 8) & 0xFF;
 	array[3] = ntohl(ct->tuplehash[dir].tuple.src.ip) & 0xFF;
 
-	for (i = 0; i < sizeof(search) / sizeof(search[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(search); i++) {
 		if (search[i].dir != dir) continue;
 
 		found = find_pattern(ftp_buffer, skb->len - dataoff,

net/ipv4/route.c

@@ -1153,7 +1153,7 @@ static __inline__ unsigned short guess_mtu(unsigned short old_mtu)
 {
 	int i;
 	
-	for (i = 0; i < sizeof(mtu_plateau) / sizeof(mtu_plateau[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(mtu_plateau); i++)
 		if (old_mtu > mtu_plateau[i])
 			return mtu_plateau[i];
 	return 68;

net/ipv4/syncookies.c

@@ -17,6 +17,7 @@
 #include <linux/tcp.h>
 #include <linux/slab.h>
 #include <linux/random.h>
+#include <linux/kernel.h>
 #include <net/tcp.h>
 
 extern int sysctl_tcp_syncookies;
@@ -38,7 +39,7 @@ static __u16 const msstab[] = {
 	(__u16)-1
 };
 /* The number doesn't include the -1 terminator */
-#define NUM_MSS (sizeof(msstab)/sizeof(msstab[0]) - 1)
+#define NUM_MSS (ARRAY_SIZE(msstab) - 1)
 
 /*
  * Generate a syncookie.  mssp points to the mss, which is returned

net/irda/irproc.c

@@ -53,8 +53,6 @@ static struct irda_entry dir[] = {
 	{"irias",	irias_proc_read},
 };
 
-#define IRDA_ENTRIES_NUM (sizeof(dir)/sizeof(dir[0]))
- 
 /*
  * Function irda_proc_register (void)
  *
@@ -70,7 +68,7 @@ void __init irda_proc_register(void)
 		return;
 	proc_irda->owner = THIS_MODULE;
 
-	for (i=0;i<IRDA_ENTRIES_NUM;i++)
+	for (i=0; i<ARRAY_SIZE(dir); i++)
 		create_proc_info_entry(dir[i].name,0,proc_irda,dir[i].fn);
 }
 
@@ -85,7 +83,7 @@ void __exit irda_proc_unregister(void)
 	int i;
 
         if (proc_irda) {
-                for (i=0;i<IRDA_ENTRIES_NUM;i++)
+                for (i=0; i<ARRAY_SIZE(dir); i++)
                         remove_proc_entry(dir[i].name, proc_irda);
 
                 remove_proc_entry("net/irda", NULL);

net/netlink/netlink_dev.c

@@ -232,7 +232,7 @@ int __init init_netlink(void)
 	devfs_mk_dir("netlink");
 
 	/*  Someone tell me the official names for the uppercase ones  */
-	for (i = 0; i < sizeof(entries)/sizeof(entries[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(entries); i++) {
 		devfs_mk_cdev(MKDEV(NETLINK_MAJOR, entries[i].minor),
 			S_IFCHR|S_IRUSR|S_IWUSR, "netlink/%s", entries[i].name);
 	}
@@ -259,7 +259,7 @@ void cleanup_module(void)
 {
 	int i;
 
-	for (i = 0; i < sizeof(entries)/sizeof(entries[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(entries); i++)
 		devfs_remove("netlink/%s", entries[i].name);
 	for (i = 0; i < 16; i++)
 		devfs_remove("netlink/tap%d", i);

net/sctp/objcnt.c

@@ -38,6 +38,7 @@
  * be incorporated into the next SCTP release.
  */
 
+#include <linux/kernel.h>
 #include <net/sctp/sctp.h>
 
 /*
@@ -88,7 +89,7 @@ static int sctp_dbg_objcnt_read(char *buffer, char **start, off_t offset,
 	char temp[128];
 
 	/* How many entries? */
-	entries = sizeof(sctp_dbg_objcnt)/sizeof(sctp_dbg_objcnt[0]);
+	entries = ARRAY_SIZE(sctp_dbg_objcnt);
 
 	/* Walk the entries and print out the debug information
 	 * for proc fs.

net/sunrpc/pmap_clnt.c

@@ -288,7 +288,7 @@ static struct rpc_stat		pmap_stats;
 struct rpc_program	pmap_program = {
 	.name		= "portmap",
 	.number		= RPC_PMAP_PROGRAM,
-	.nrvers		= sizeof(pmap_version)/sizeof(pmap_version[0]),
+	.nrvers		= ARRAY_SIZE(pmap_version),
 	.version	= pmap_version,
 	.stats		= &pmap_stats,
 };

net/xfrm/xfrm_algo.c

@@ -251,17 +251,17 @@ static struct xfrm_algo_desc calg_list[] = {
 
 static inline int aalg_entries(void)
 {
-	return sizeof(aalg_list) / sizeof(aalg_list[0]);
+	return ARRAY_SIZE(aalg_list);
 }
 
 static inline int ealg_entries(void)
 {
-	return sizeof(ealg_list) / sizeof(ealg_list[0]);
+	return ARRAY_SIZE(ealg_list);
 }
 
 static inline int calg_entries(void)
 {
-	return sizeof(calg_list) / sizeof(calg_list[0]);
+	return ARRAY_SIZE(calg_list);
 }
 
 /* Todo: generic iterators */