From c23303922cf57d16b82fa6c87eab4a668f6aa72f Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 12 Oct 2009 15:38:17 +0100
Subject: [PATCH] --- yaml --- r: 167565 b: refs/heads/master c:
 b9d2dde0556cde38105033cb39841658d81921d2 h: refs/heads/master i:   167563:
 8b0482087e3b2f85880fe8821a00f58197b7b0d3 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/et131x/et1310_rx.c | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index baef667046a2..c769107f7351 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4439c9353589f4def506b94f8f6344433333a4b9
+refs/heads/master: b9d2dde0556cde38105033cb39841658d81921d2
diff --git a/trunk/drivers/staging/et131x/et1310_rx.c b/trunk/drivers/staging/et131x/et1310_rx.c
index 8f2e91fa0a86..10e21db57ac3 100644
--- a/trunk/drivers/staging/et131x/et1310_rx.c
+++ b/trunk/drivers/staging/et131x/et1310_rx.c
@@ -1177,12 +1177,20 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
 
 static inline u32 bump_fbr(u32 *fbr, u32 limit)
 {
-	u32 v = *fbr;
-	add_10bit(&v, 1);
-	if (v > limit)
-		v = (*fbr & ~ET_DMA10_MASK) ^ ET_DMA10_WRAP;
-	*fbr = v;
-	return v;
+        u32 v = *fbr;
+        v++;
+        /* This works for all cases where limit < 1024. The 1023 case
+           works because 1023++ is 1024 which means the if condition is not
+           taken but the carry of the bit into the wrap bit toggles the wrap
+           value correctly */
+        if ((v & ET_DMA10_MASK) > limit) {
+                v &= ~ET_DMA10_MASK;
+                v ^= ET_DMA10_WRAP;
+        }
+        /* For the 1023 case */
+        v &= (ET_DMA10_MASK|ET_DMA10_WRAP);
+        *fbr = v;
+        return v;
 }
 
 /**