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

2 files changed, 9 insertions, 13 deletions

diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c
index aaa958798f3f..109a96d90007 100644
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
@@ -111,9 +111,10 @@ isl38xx_handle_wakeup(isl38xx_control_block *control_block,
 void
 isl38xx_trigger_device(int asleep, void __iomem *device_base)
 {
-        u32 reg, counter = 0;
+        u32 reg;
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
+        u32 counter = 0;
         struct timeval current_time;
         DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n");
 #endif
@@ -130,7 +131,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                       current_time.tv_sec, (long)current_time.tv_usec,
                       readl(device_base + ISL38XX_CTRL_STAT_REG));
 #endif
-                udelay(ISL38XX_WRITEIO_DELAY);
 
                 reg = readl(device_base + ISL38XX_INT_IDENT_REG);
                 if (reg == 0xabadface) {
@@ -144,7 +144,9 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                         while (reg = readl(device_base + ISL38XX_CTRL_STAT_REG),
                                (reg & ISL38XX_CTRL_STAT_SLEEPMODE) == 0) {
                                 udelay(ISL38XX_WRITEIO_DELAY);
+#if VERBOSE > SHOW_ERROR_MESSAGES
                                 counter++;
+#endif
                         }
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
@@ -152,10 +154,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                               "%08li.%08li Device register read %08x\n",
                               current_time.tv_sec, (long)current_time.tv_usec,
                               readl(device_base + ISL38XX_CTRL_STAT_REG));
-#endif
-                        udelay(ISL38XX_WRITEIO_DELAY);
-
-#if VERBOSE > SHOW_ERROR_MESSAGES
                         do_gettimeofday(&current_time);
                         DEBUG(SHOW_TRACING,
                               "%08li.%08li Device asleep counter %i\n",
@@ -170,7 +168,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
 
                 /* perform another read on the Device Status Register */
                 reg = readl(device_base + ISL38XX_CTRL_STAT_REG);
-                udelay(ISL38XX_WRITEIO_DELAY);
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
                 do_gettimeofday(&current_time);
@@ -186,7 +183,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
 
                 isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_UPDATE,
                                   ISL38XX_DEV_INT_REG);
-                udelay(ISL38XX_WRITEIO_DELAY);
         }
 }
 
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 80ae081ab4b7..33d64d2ee53f 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -226,17 +226,17 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
                 priv->data_low_tx_full = 1;
         }
 
+        /* set the transmission time */
+        ndev->trans_start = jiffies;
+        priv->statistics.tx_packets++;
+        priv->statistics.tx_bytes += skb->len;
+
         /* trigger the device */
         islpci_trigger(priv);
 
         /* unlock the driver code */
         spin_unlock_irqrestore(&priv->slock, flags);
 
-        /* set the transmission time */
-        ndev->trans_start = jiffies;
-        priv->statistics.tx_packets++;
-        priv->statistics.tx_bytes += skb->len;
-
         return 0;
 
       drop_free: