diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-11 23:28:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-11 23:28:57 -0700 |
| commit | 2c5849ea38fdad477d72dcf1c8c4842db4b33aae (patch) | |
| tree | 605cb5d1a27407c965360319f95dbcb78a8268c4 /drivers/net/dnet.c | |
| parent | 4796417417a62e2ae83d92cb92e1ecf9ec67b5f5 (diff) | |
| download | blackbird-op-linux-2c5849ea38fdad477d72dcf1c8c4842db4b33aae.tar.gz blackbird-op-linux-2c5849ea38fdad477d72dcf1c8c4842db4b33aae.zip | |
dnet: Fix warnings on 64-bit.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dnet.c')
| -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) 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))) { |
