Re: [PATCH] dnet: Dave DNET ethernet controller driver (updated)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <yanok@...>
Cc: <dada1@...>, <linux-arm-kernel@...>, <netdev@...>, <s.hauer@...>, <wd@...>, <dzu@...>
Date: Thursday, March 12, 2009 - 2:29 am

From: Ilya Yanok <yanok@emcraft.com>
Date: Thu, 12 Mar 2009 02:33:07 +0300


Applied, but I had to add the following patch to fix warnings
and actual errors on 64-bit.

dnet: Fix warnings on 64-bit.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/dnet.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 92c3bd3..4b96974 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -553,8 +553,8 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	tx_status = dnet_readl(bp, TX_STATUS);
 
-	pr_debug("start_xmit: len %u head %p data %p tail %p end %p\n",
-	       skb->len, skb->head, skb->data, skb->tail, skb->end);
+	pr_debug("start_xmit: len %u head %p data %p\n",
+	       skb->len, skb->head, skb->data);
 	dnet_print_skb(skb);
 
 	/* frame size (words) */
@@ -564,11 +564,11 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	tx_status = dnet_readl(bp, TX_STATUS);
 
-	bufp = (unsigned int *)(((u32) skb->data) & 0xFFFFFFFC);
+	bufp = (unsigned int *)(((unsigned long) skb->data) & ~0x3UL);
 	wrsz = (u32) skb->len + 3;
-	wrsz += ((u32) skb->data) & 0x3;
+	wrsz += ((unsigned long) skb->data) & 0x3;
 	wrsz >>= 2;
-	tx_cmd = ((((unsigned int)(skb->data)) & 0x03) << 16) | (u32) skb->len;
+	tx_cmd = ((((unsigned long)(skb->data)) & 0x03) << 16) | (u32) skb->len;
 
 	/* check if there is enough room for the current frame */
 	if (wrsz < (DNET_FIFO_SIZE - dnet_readl(bp, TX_FIFO_WCNT))) {
-- 
1.6.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] dnet: Dave DNET ethernet controller driver, Ilya Yanok, (Tue Mar 10, 10:29 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Stephen Hemminger, (Wed Mar 11, 12:18 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Michael Cashwell, (Thu Mar 12, 9:41 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Thu Mar 12, 10:05 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Robert Schwebel, (Fri Mar 13, 3:49 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Fri Mar 13, 4:12 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Jamie Lokier, (Thu Mar 12, 2:02 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 10:26 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Wed Mar 11, 4:44 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Wed Mar 11, 4:49 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Wed Mar 11, 4:56 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Stephen Hemminger, (Wed Mar 11, 8:13 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 6:41 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Thu Mar 12, 8:55 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 10:21 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 11:12 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Mike (mwester), (Thu Mar 12, 4:24 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 8:29 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 12:25 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 1:49 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 2:25 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Jamie Lokier, (Thu Mar 12, 3:25 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 3:43 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 3:05 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Jamie Lokier, (Thu Mar 12, 5:59 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 8:16 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 7:42 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 8:21 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Fri Mar 13, 6:30 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 3:29 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Thu Mar 12, 3:14 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Thu Mar 12, 1:43 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 1:52 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Jamie Lokier, (Thu Mar 12, 2:06 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 2:48 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Thu Mar 12, 3:04 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Wolfgang Denk, (Thu Mar 12, 4:14 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Russell King - ARM Linux, (Thu Mar 12, 4:35 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Thu Mar 12, 4:27 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Christer Weinigel, (Thu Mar 12, 3:21 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Neil Horman, (Thu Mar 12, 3:16 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Jamie Lokier, (Thu Mar 12, 3:15 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Dan Williams, (Thu Mar 12, 2:39 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Thu Mar 12, 11:01 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Thu Mar 12, 10:34 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Russell King - ARM Linux, (Wed Mar 11, 5:33 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Wed Mar 11, 4:57 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Wolfgang Denk, (Wed Mar 11, 5:09 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Wed Mar 11, 9:23 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Riku Voipio, (Wed Mar 11, 3:15 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, David Miller, (Wed Mar 11, 8:44 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Robert Schwebel, (Wed Mar 11, 2:23 pm)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Dan Williams, (Wed Mar 11, 10:00 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Sascha Hauer, (Wed Mar 11, 6:35 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver, Eric Dumazet, (Wed Mar 11, 12:00 am)
Re: [PATCH] dnet: Dave DNET ethernet controller driver (upda..., David Miller, (Thu Mar 12, 2:29 am)