From 84d4a53c331a06a8806497a73664ad0eed12a8bc Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 9 Nov 2008 17:56:34 +0100 Subject: [PATCH] --- yaml --- r: 126621 b: refs/heads/master c: 9ba8aa7a94c5f3f5ac41ba39be5b1abf1688565e h: refs/heads/master i: 126619: 9b8a071864c880ee3759c726a31779ed47711f30 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211wext.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 884022dcffe3..ae6d3a6c803b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d11e5f22ac9330ebe8f6157395a1a55645064322 +refs/heads/master: 9ba8aa7a94c5f3f5ac41ba39be5b1abf1688565e diff --git a/trunk/drivers/staging/wlan-ng/p80211wext.c b/trunk/drivers/staging/wlan-ng/p80211wext.c index 762922c8f918..f7ba70fcfc4f 100644 --- a/trunk/drivers/staging/wlan-ng/p80211wext.c +++ b/trunk/drivers/staging/wlan-ng/p80211wext.c @@ -122,7 +122,7 @@ static const long p80211wext_channel_freq[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484 }; -#define NUM_CHANNELS (sizeof(p80211wext_channel_freq) / sizeof(p80211wext_channel_freq[0])) +#define NUM_CHANNELS ARRAY_SIZE(p80211wext_channel_freq) /* steal a spare bit to store the shared/opensystems state. should default to open if not set */ #define HOSTWEP_SHAREDKEY BIT3 @@ -1787,7 +1787,7 @@ static iw_handler p80211wext_handlers[] = { }; struct iw_handler_def p80211wext_handler_def = { - .num_standard = sizeof(p80211wext_handlers) / sizeof(iw_handler), + .num_standard = ARRAY_SIZE(p80211wext_handlers), .num_private = 0, .num_private_args = 0, .standard = p80211wext_handlers,