Use list_for_each() in the Host AP driver to iterate over the MAC restrictions and the STA info lists Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx> -- diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 5b3abd5..0718eeb 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c @@ -352,8 +352,7 @@ static int ap_control_proc_read(char *page, char **start, off_t off, p += sprintf(p, "MAC entries: %u\n", ap->mac_restrictions.entries); p += sprintf(p, "MAC list:\n"); spin_lock_bh(&ap->mac_restrictions.lock); - for (ptr = ap->mac_restrictions.mac_list.next; - ptr != &ap->mac_restrictions.mac_list; ptr = ptr->next) { + list_for_each(ptr, &ap->mac_restrictions.mac_list) { if (p - page > PAGE_SIZE - 80) { p += sprintf(p, "All entries did not fit one page.\n"); break; @@ -393,8 +392,7 @@ int ap_control_del_mac(struct mac_restrictions *mac_restrictions, u8 *mac) struct mac_entry *entry; spin_lock_bh(&mac_restrictions->lock); - for (ptr = mac_restrictions->mac_list.next; - ptr != &mac_restrictions->mac_list; ptr = ptr->next) { + list_for_each(ptr, &mac_restrictions->mac_list) { entry = list_entry(ptr, struct mac_entry, list); if (memcmp(entry->addr, mac, ETH_ALEN) == 0) { @@ -421,8 +419,7 @@ static int ap_control_mac_deny(struct mac_restrictions *mac_restrictions, return 0; spin_lock_bh(&mac_restrictions->lock); - for (ptr = mac_restrictions->mac_list.next; - ptr != &mac_restrictions->mac_list; ptr = ptr->next) { + list_for_each(ptr, &mac_restrictions->mac_list) { entry = list_entry(ptr, struct mac_entry, list); if (memcmp(entry->addr, mac, ETH_ALEN) == 0) { @@ -529,7 +526,7 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off, p += sprintf(p, "# BSSID CHAN SIGNAL NOISE RATE SSID FLAGS\n"); spin_lock_bh(&ap->sta_table_lock); - for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) { + list_for_each(ptr, &ap->sta_list) { struct sta_info *sta = (struct sta_info *) ptr; if (!sta->ap) @@ -3205,7 +3202,7 @@ void hostap_update_rates(local_info_t *local) return; spin_lock_bh(&ap->sta_table_lock); - for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) { + list_for_each(ptr, &ap->sta_list) { struct sta_info *sta = (struct sta_info *) ptr; prism2_check_tx_rates(sta); } -- Matthias Kaehlcke Linux Application Developer Barcelona You can chain me, you can torture me, you can even destroy this body, but you will never imprison my mind (Mahatma Gandhi) .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `- - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html