From 6a2b8c5492c143ca8c7bab2b44bee2dfdbb63127 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 21 Dec 2007 06:20:53 +0000 Subject: [PATCH] --- yaml --- r: 75163 b: refs/heads/master c: 8a5ed9efe661dd42bc140e522c2635e0d7b26141 h: refs/heads/master i: 75161: 9f58690cca2f0f450225729baaca1ac088c453a2 75159: fbc80e2564f8e20ab4b2e38df527f5af25bb87dd v: v3 --- [refs] | 2 +- trunk/drivers/net/typhoon.c | 4 ++-- trunk/drivers/net/typhoon.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eca99a39ef01..6e7424907221 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b46281f9c5d6ab7b6e412e83f8c62cecf4ebbdfd +refs/heads/master: 8a5ed9efe661dd42bc140e522c2635e0d7b26141 diff --git a/trunk/drivers/net/typhoon.c b/trunk/drivers/net/typhoon.c index 16d443b71264..501abe379047 100644 --- a/trunk/drivers/net/typhoon.c +++ b/trunk/drivers/net/typhoon.c @@ -1596,7 +1596,7 @@ typhoon_recycle_rx_skb(struct typhoon *tp, u32 idx) struct rx_free *r; if((ring->lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) == - indexes->rxBuffCleared) { + le32_to_cpu(indexes->rxBuffCleared)) { /* no room in ring, just drop the skb */ dev_kfree_skb_any(rxb->skb); @@ -1627,7 +1627,7 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx) rxb->skb = NULL; if((ring->lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) == - indexes->rxBuffCleared) + le32_to_cpu(indexes->rxBuffCleared)) return -ENOMEM; skb = dev_alloc_skb(PKT_BUF_SZ); diff --git a/trunk/drivers/net/typhoon.h b/trunk/drivers/net/typhoon.h index 19df20889b82..a02e09593970 100644 --- a/trunk/drivers/net/typhoon.h +++ b/trunk/drivers/net/typhoon.h @@ -73,7 +73,7 @@ struct typhoon_indexes { volatile __le32 txLoCleared; volatile __le32 txHiCleared; volatile __le32 rxLoReady; - volatile __u32 rxBuffCleared; /* AV: really? */ + volatile __le32 rxBuffCleared; volatile __le32 cmdCleared; volatile __le32 respReady; volatile __le32 rxHiReady;