Skip to content

Commit 2c5849e

Browse files
committed
dnet: Fix warnings on 64-bit.
Signed-off-by: David S. Miller <[email protected]>
1 parent 4796417 commit 2c5849e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/net/dnet.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
553553

554554
tx_status = dnet_readl(bp, TX_STATUS);
555555

556-
pr_debug("start_xmit: len %u head %p data %p tail %p end %p\n",
557-
skb->len, skb->head, skb->data, skb->tail, skb->end);
556+
pr_debug("start_xmit: len %u head %p data %p\n",
557+
skb->len, skb->head, skb->data);
558558
dnet_print_skb(skb);
559559

560560
/* frame size (words) */
@@ -564,11 +564,11 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
564564

565565
tx_status = dnet_readl(bp, TX_STATUS);
566566

567-
bufp = (unsigned int *)(((u32) skb->data) & 0xFFFFFFFC);
567+
bufp = (unsigned int *)(((unsigned long) skb->data) & ~0x3UL);
568568
wrsz = (u32) skb->len + 3;
569-
wrsz += ((u32) skb->data) & 0x3;
569+
wrsz += ((unsigned long) skb->data) & 0x3;
570570
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;
572572

573573
/* check if there is enough room for the current frame */
574574
if (wrsz < (DNET_FIFO_SIZE - dnet_readl(bp, TX_FIFO_WCNT))) {

0 commit comments

Comments
 (0)