Use list_for_each() in the Prism54 driver to iterate over the MAC list
Signed-off-by: Matthias Kaehlcke <[email protected]>
--
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 283be4a..34cf13c 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1861,7 +1861,7 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
if (down_interruptible(&acl->sem))
return -ERESTARTSYS;
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
+ list_for_each(ptr, &acl->mac_list) {
entry = list_entry(ptr, struct mac_entry, _list);
if (memcmp(entry->addr, addr->sa_data, ETH_ALEN) == 0) {
@@ -1891,7 +1891,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
if (down_interruptible(&acl->sem))
return -ERESTARTSYS;
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
+ list_for_each(ptr, &acl->mac_list) {
entry = list_entry(ptr, struct mac_entry, _list);
memcpy(dst->sa_data, entry->addr, ETH_ALEN);
@@ -1972,7 +1972,7 @@ prism54_mac_accept(struct islpci_acl *acl, char *mac)
return 1;
}
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
+ list_for_each(ptr, &acl->mac_list) {
entry = list_entry(ptr, struct mac_entry, _list);
if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
res = 1;
--
Matthias Kaehlcke
Linux Application Developer
Barcelona
If sharing a thing in no way diminishes it,
it is not rightly owned if it is not shared
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
El Fri, May 25, 2007 at 03:04:44PM +0200 Matthias Kaehlcke ha dit:
> Use list_for_each() in the Prism54 driver to iterate over the MAC list
In response to a similar patch Christoph Hellwig suggests the use of
list_for_each_entry() instead of list_for_each(). Here is a evolution
of the patch that takes into account Christophs' suggestion
--
Prism54 driver: Use list_for_each_entry() instead of manual iteration
and substitute a list_for_each_safe() loop with
list_for_each_entry_safe()
Signed-off-by: Matthias Kaehlcke <[email protected]>
--
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 283be4a..585f599 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry;
- struct list_head *ptr;
struct sockaddr *addr = (struct sockaddr *) extra;
if (addr->sa_family != ARPHRD_ETHER)
@@ -1861,11 +1860,9 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
if (down_interruptible(&acl->sem))
return -ERESTARTSYS;
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
- entry = list_entry(ptr, struct mac_entry, _list);
-
+ list_for_each_entry(entry, &acl->mac_list, _list) {
if (memcmp(entry->addr, addr->sa_data, ETH_ALEN) == 0) {
- list_del(ptr);
+ list_del(&entry->_list);
acl->size--;
kfree(entry);
up(&acl->sem);
@@ -1883,7 +1880,6 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
islpci_private *priv = netdev_priv(ndev);
struct islpci_acl *acl = &priv->acl;
struct mac_entry *entry;
- struct list_head *ptr;
struct sockaddr *dst = (struct sockaddr *) extra;
dwrq->length = 0;
@@ -1891,9 +1887,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
if (down_interruptible(&acl->sem))
return -ERESTARTSYS;
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
- entry = list_entry(ptr, struct mac_entry, _list);
-
+ list_for_each_entry(entry, &acl->mac_list, _list) {
memcpy(dst->sa_data, entry->addr, ETH_ALEN);
dst->sa_family = ARPHRD_ETHER;
dwrq->length++;
@@ -1960,7 +1954,6 @@ prism54_get_policy(struct net_device *ndev, struct iw_request_info *info,
static int
prism54_mac_accept(struct islpci_acl *acl, char *mac)
{
- struct list_head *ptr;
struct mac_entry *entry;
int res = 0;
@@ -1972,8 +1965,7 @@ prism54_mac_accept(struct islpci_acl *acl, char *mac)
return 1;
}
- for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
- entry = list_entry(ptr, struct mac_entry, _list);
+ list_for_each_entry(entry, &acl->mac_list, _list) {
if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
res = 1;
break;
@@ -2216,11 +2208,9 @@ prism54_wpa_bss_ie_init(islpci_private *priv)
void
prism54_wpa_bss_ie_clean(islpci_private *priv)
{
- struct list_head *ptr, *n;
+ struct islpci_bss_wpa_ie *bss, *n;
- list_for_each_safe(ptr, n, &priv->bss_wpa_list) {
- struct islpci_bss_wpa_ie *bss;
- bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);
+ list_for_each_entry_safe(bss, n, &priv->bss_wpa_list, list) {
kfree(bss);
}
}
--
Matthias Kaehlcke
Linux Application Developer
Barcelona
I am incapable of conceiving infinity, and yet I do not accept finity
(Simone de Beauvoir)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
On 5/27/07, Matthias Kaehlcke <[email protected]> wrote:
> El Fri, May 25, 2007 at 03:04:44PM +0200 Matthias Kaehlcke ha dit:
>
> > Use list_for_each() in the Prism54 driver to iterate over the MAC list
>
> In response to a similar patch Christoph Hellwig suggests the use of
> list_for_each_entry() instead of list_for_each(). Here is a evolution
> of the patch that takes into account Christophs' suggestion
>
> --
>
> Prism54 driver: Use list_for_each_entry() instead of manual iteration
> and substitute a list_for_each_safe() loop with
> list_for_each_entry_safe()
>
> Signed-off-by: Matthias Kaehlcke <[email protected]>
Singed-off-by: Luis R. Rodriguez <[email protected]>
Looks good,
Luis
> --
>
> diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
> index 283be4a..585f599 100644
> --- a/drivers/net/wireless/prism54/isl_ioctl.c
> +++ b/drivers/net/wireless/prism54/isl_ioctl.c
> @@ -1853,7 +1853,6 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
> islpci_private *priv = netdev_priv(ndev);
> struct islpci_acl *acl = &priv->acl;
> struct mac_entry *entry;
> - struct list_head *ptr;
> struct sockaddr *addr = (struct sockaddr *) extra;
>
> if (addr->sa_family != ARPHRD_ETHER)
> @@ -1861,11 +1860,9 @@ prism54_del_mac(struct net_device *ndev, struct iw_request_info *info,
>
> if (down_interruptible(&acl->sem))
> return -ERESTARTSYS;
> - for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
> - entry = list_entry(ptr, struct mac_entry, _list);
> -
> + list_for_each_entry(entry, &acl->mac_list, _list) {
> if (memcmp(entry->addr, addr->sa_data, ETH_ALEN) == 0) {
> - list_del(ptr);
> + list_del(&entry->_list);
> acl->size--;
> kfree(entry);
> up(&acl->sem);
> @@ -1883,7 +1880,6 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
> islpci_private *priv = netdev_priv(ndev);
> struct islpci_acl *acl = &priv->acl;
> struct mac_entry *entry;
> - struct list_head *ptr;
> struct sockaddr *dst = (struct sockaddr *) extra;
>
> dwrq->length = 0;
> @@ -1891,9 +1887,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
> if (down_interruptible(&acl->sem))
> return -ERESTARTSYS;
>
> - for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
> - entry = list_entry(ptr, struct mac_entry, _list);
> -
> + list_for_each_entry(entry, &acl->mac_list, _list) {
> memcpy(dst->sa_data, entry->addr, ETH_ALEN);
> dst->sa_family = ARPHRD_ETHER;
> dwrq->length++;
> @@ -1960,7 +1954,6 @@ prism54_get_policy(struct net_device *ndev, struct iw_request_info *info,
> static int
> prism54_mac_accept(struct islpci_acl *acl, char *mac)
> {
> - struct list_head *ptr;
> struct mac_entry *entry;
> int res = 0;
>
> @@ -1972,8 +1965,7 @@ prism54_mac_accept(struct islpci_acl *acl, char *mac)
> return 1;
> }
>
> - for (ptr = acl->mac_list.next; ptr != &acl->mac_list; ptr = ptr->next) {
> - entry = list_entry(ptr, struct mac_entry, _list);
> + list_for_each_entry(entry, &acl->mac_list, _list) {
> if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
> res = 1;
> break;
> @@ -2216,11 +2208,9 @@ prism54_wpa_bss_ie_init(islpci_private *priv)
> void
> prism54_wpa_bss_ie_clean(islpci_private *priv)
> {
> - struct list_head *ptr, *n;
> + struct islpci_bss_wpa_ie *bss, *n;
>
> - list_for_each_safe(ptr, n, &priv->bss_wpa_list) {
> - struct islpci_bss_wpa_ie *bss;
> - bss = list_entry(ptr, struct islpci_bss_wpa_ie, list);
> + list_for_each_entry_safe(bss, n, &priv->bss_wpa_list, list) {
> kfree(bss);
> }
> }
>
> --
> Matthias Kaehlcke
> Linux Application Developer
> Barcelona
>
> I am incapable of conceiving infinity, and yet I do not accept finity
> (Simone de Beauvoir)
> .''`.
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>