diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-12 02:28:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-12 02:28:57 -0400 |
commit | 2c5849ea38fdad477d72dcf1c8c4842db4b33aae (patch) | |
tree | 605cb5d1a27407c965360319f95dbcb78a8268c4 | |
parent | 4796417417a62e2ae83d92cb92e1ecf9ec67b5f5 (diff) |
dnet: Fix warnings on 64-bit.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | 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 92c3bd3a4721..4b96974fe76e 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) | |||
553 | 553 | ||
554 | tx_status = dnet_readl(bp, TX_STATUS); | 554 | tx_status = dnet_readl(bp, TX_STATUS); |
555 | 555 | ||
556 | pr_debug("start_xmit: len %u head %p data %p tail %p end %p\n", | 556 | pr_debug("start_xmit: len %u head %p data %p\n", |
557 | skb->len, skb->head, skb->data, skb->tail, skb->end); | 557 | skb->len, skb->head, skb->data); |
558 | dnet_print_skb(skb); | 558 | dnet_print_skb(skb); |
559 | 559 | ||
560 | /* frame size (words) */ | 560 | /* frame size (words) */ |
@@ -564,11 +564,11 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
564 | 564 | ||
565 | tx_status = dnet_readl(bp, TX_STATUS); | 565 | tx_status = dnet_readl(bp, TX_STATUS); |
566 | 566 | ||
567 | bufp = (unsigned int *)(((u32) skb->data) & 0xFFFFFFFC); | 567 | bufp = (unsigned int *)(((unsigned long) skb->data) & ~0x3UL); |
568 | wrsz = (u32) skb->len + 3; | 568 | wrsz = (u32) skb->len + 3; |
569 | wrsz += ((u32) skb->data) & 0x3; | 569 | wrsz += ((unsigned long) skb->data) & 0x3; |
570 | wrsz >>= 2; | 570 | wrsz >>= 2; |
571 | tx_cmd = ((((unsigned int)(skb->data)) & 0x03) << 16) | (u32) skb->len; | 571 | tx_cmd = ((((unsigned long)(skb->data)) & 0x03) << 16) | (u32) skb->len; |
572 | 572 | ||
573 | /* check if there is enough room for the current frame */ | 573 | /* check if there is enough room for the current frame */ |
574 | if (wrsz < (DNET_FIFO_SIZE - dnet_readl(bp, TX_FIFO_WCNT))) { | 574 | if (wrsz < (DNET_FIFO_SIZE - dnet_readl(bp, TX_FIFO_WCNT))) { |