]> err.no Git - linux-2.6/commitdiff
natsemi: Avoid IntrStatus lossage if RX state machine resets.
authorbroonie@sirena.org.uk <broonie@sirena.org.uk>
Wed, 14 Mar 2007 19:49:15 +0000 (19:49 +0000)
committerJeff Garzik <jeff@garzik.org>
Thu, 15 Mar 2007 14:59:54 +0000 (10:59 -0400)
This patch fixes the poll routine for the natsemi driver so that if the
driver detects an RX state machine lockup then no interrupts will be
lost while the driver recovers from that.

Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/natsemi.c

index 5f88200724e6c12474f3a1a8fe5cdbdd1f349419..349b96a3ec4c04e8b5332b1480a2ae040c922598 100644 (file)
@@ -2169,6 +2169,14 @@ static int natsemi_poll(struct net_device *dev, int *budget)
                               dev->name, np->intr_status,
                               readl(ioaddr + IntrMask));
 
+               /* netdev_rx() may read IntrStatus again if the RX state
+                * machine falls over so do it first. */
+               if (np->intr_status &
+                   (IntrRxDone | IntrRxIntr | RxStatusFIFOOver |
+                    IntrRxErr | IntrRxOverrun)) {
+                       netdev_rx(dev, &work_done, work_to_do);
+               }
+
                if (np->intr_status &
                    (IntrTxDone | IntrTxIntr | IntrTxIdle | IntrTxErr)) {
                        spin_lock(&np->lock);
@@ -2180,12 +2188,6 @@ static int natsemi_poll(struct net_device *dev, int *budget)
                if (np->intr_status & IntrAbnormalSummary)
                        netdev_error(dev, np->intr_status);
 
-               if (np->intr_status &
-                   (IntrRxDone | IntrRxIntr | RxStatusFIFOOver |
-                    IntrRxErr | IntrRxOverrun)) {
-                       netdev_rx(dev, &work_done, work_to_do);
-               }
-
                *budget -= work_done;
                dev->quota -= work_done;