aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/main.c14
-rw-r--r--drivers/net/wireless/libertas/wext.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index cb0359df355e..a54171af7b97 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -123,28 +123,28 @@ struct region_cfp_table {
123static struct region_cfp_table region_cfp_table[] = { 123static struct region_cfp_table region_cfp_table[] = {
124 {0x10, /*US FCC */ 124 {0x10, /*US FCC */
125 channel_freq_power_US_BG, 125 channel_freq_power_US_BG,
126 sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power), 126 ARRAY_SIZE(channel_freq_power_US_BG),
127 } 127 }
128 , 128 ,
129 {0x20, /*CANADA IC */ 129 {0x20, /*CANADA IC */
130 channel_freq_power_US_BG, 130 channel_freq_power_US_BG,
131 sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power), 131 ARRAY_SIZE(channel_freq_power_US_BG),
132 } 132 }
133 , 133 ,
134 {0x30, /*EU*/ channel_freq_power_EU_BG, 134 {0x30, /*EU*/ channel_freq_power_EU_BG,
135 sizeof(channel_freq_power_EU_BG) / sizeof(struct chan_freq_power), 135 ARRAY_SIZE(channel_freq_power_EU_BG),
136 } 136 }
137 , 137 ,
138 {0x31, /*SPAIN*/ channel_freq_power_SPN_BG, 138 {0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
139 sizeof(channel_freq_power_SPN_BG) / sizeof(struct chan_freq_power), 139 ARRAY_SIZE(channel_freq_power_SPN_BG),
140 } 140 }
141 , 141 ,
142 {0x32, /*FRANCE*/ channel_freq_power_FR_BG, 142 {0x32, /*FRANCE*/ channel_freq_power_FR_BG,
143 sizeof(channel_freq_power_FR_BG) / sizeof(struct chan_freq_power), 143 ARRAY_SIZE(channel_freq_power_FR_BG),
144 } 144 }
145 , 145 ,
146 {0x40, /*JAPAN*/ channel_freq_power_JPN_BG, 146 {0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
147 sizeof(channel_freq_power_JPN_BG) / sizeof(struct chan_freq_power), 147 ARRAY_SIZE(channel_freq_power_JPN_BG),
148 } 148 }
149 , 149 ,
150/*Add new region here */ 150/*Add new region here */
@@ -1422,7 +1422,7 @@ struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *c
1422 1422
1423 lbs_deb_enter(LBS_DEB_MAIN); 1423 lbs_deb_enter(LBS_DEB_MAIN);
1424 1424
1425 end = sizeof(region_cfp_table)/sizeof(struct region_cfp_table); 1425 end = ARRAY_SIZE(region_cfp_table);
1426 1426
1427 for (i = 0; i < end ; i++) { 1427 for (i = 0; i < end ; i++) {
1428 lbs_deb_main("region_cfp_table[i].region=%d\n", 1428 lbs_deb_main("region_cfp_table[i].region=%d\n",
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 3f628223bc6c..f8036efd7294 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2149,13 +2149,13 @@ static const iw_handler mesh_wlan_handler[] = {
2149 (iw_handler) NULL, /* SIOCSIWPMKSA */ 2149 (iw_handler) NULL, /* SIOCSIWPMKSA */
2150}; 2150};
2151struct iw_handler_def libertas_handler_def = { 2151struct iw_handler_def libertas_handler_def = {
2152 .num_standard = sizeof(wlan_handler) / sizeof(iw_handler), 2152 .num_standard = ARRAY_SIZE(wlan_handler),
2153 .standard = (iw_handler *) wlan_handler, 2153 .standard = (iw_handler *) wlan_handler,
2154 .get_wireless_stats = wlan_get_wireless_stats, 2154 .get_wireless_stats = wlan_get_wireless_stats,
2155}; 2155};
2156 2156
2157struct iw_handler_def mesh_handler_def = { 2157struct iw_handler_def mesh_handler_def = {
2158 .num_standard = sizeof(mesh_wlan_handler) / sizeof(iw_handler), 2158 .num_standard = ARRAY_SIZE(mesh_wlan_handler),
2159 .standard = (iw_handler *) mesh_wlan_handler, 2159 .standard = (iw_handler *) mesh_wlan_handler,
2160 .get_wireless_stats = wlan_get_wireless_stats, 2160 .get_wireless_stats = wlan_get_wireless_stats,
2161}; 2161};