Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  forcedeth bug fix: realtek phy
  forcedeth bug fix: vitesse phy
  forcedeth bug fix: cicada phy
  atl1: reorder atl1_main functions
  atl1: fix excessively indented code
  atl1: cleanup atl1_main
  atl1: header file cleanup
  atl1: remove irq_sem
  cdc-subset to support new vendor/product ID
  8139cp: implement the missing dev->tx_timeout
  myri10ge: Remove nonsensical limit in the tx done routine
  gianfar: kill unused header
  EP93XX_ETH must select MII
  macb: Add multicast capability
  macb: Use generic PHY layer
  s390: add barriers to qeth driver
  s390: scatter-gather for inbound traffic in qeth driver
  eHEA: Introducing support vor DLPAR memory add
  Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
  [PATCH] softmac: Fix ESSID problem
  ...

1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 283be4a70524..585f5996d292 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);
         }
 }