Commit 79cfb1fa authored by Jeff Garzik's avatar Jeff Garzik

[netdrvr] fix warnings found on 64-bit platforms

Updated:  8139too, arcnet/arcnet, rrunner
parent 76244ca6
......@@ -777,7 +777,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
u8 tmp8;
int rc;
unsigned int i;
u32 pio_start, pio_end, pio_flags, pio_len;
unsigned long pio_start, pio_end, pio_flags, pio_len;
unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
u32 version;
......
......@@ -479,7 +479,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
*(uint16_t *) skb_push(skb, 2) = type;
if (skb->nh.raw - skb->mac.raw != 2)
BUGMSG(D_NORMAL, "arcnet_header: Yikes! diff (%d) is not 2!\n",
skb->nh.raw - skb->mac.raw);
(int)(skb->nh.raw - skb->mac.raw));
return -2; /* return error -- can't transmit yet! */
}
/* otherwise, we can just add the header as usual. */
......@@ -514,7 +514,7 @@ static int arcnet_rebuild_header(struct sk_buff *skb)
if (skb->nh.raw - skb->mac.raw != 2) {
BUGMSG(D_NORMAL,
"rebuild_header: shouldn't be here! (hdrsize=%d)\n",
skb->nh.raw - skb->mac.raw);
(int)(skb->nh.raw - skb->mac.raw));
return 0;
}
type = *(uint16_t *) skb_pull(skb, 2);
......
......@@ -1335,10 +1335,10 @@ static void rr_dump(struct net_device *dev)
if (rrpriv->tx_skbuff[cons]){
len = min_t(int, 0x80, rrpriv->tx_skbuff[cons]->len);
printk("skbuff for cons %i is valid - dumping data (0x%x bytes - skbuff len 0x%x)\n", cons, len, rrpriv->tx_skbuff[cons]->len);
printk("mode 0x%x, size 0x%x,\n phys %08x, skbuff-addr %08lx, truesize 0x%x\n",
printk("mode 0x%x, size 0x%x,\n phys %08Lx, skbuff-addr %08lx, truesize 0x%x\n",
rrpriv->tx_ring[cons].mode,
rrpriv->tx_ring[cons].size,
rrpriv->tx_ring[cons].addr.addrlo,
(unsigned long long) rrpriv->tx_ring[cons].addr.addrlo,
(unsigned long)rrpriv->tx_skbuff[cons]->data,
(unsigned int)rrpriv->tx_skbuff[cons]->truesize);
for (i = 0; i < len; i++){
......@@ -1351,10 +1351,10 @@ static void rr_dump(struct net_device *dev)
printk("dumping TX ring info:\n");
for (i = 0; i < TX_RING_ENTRIES; i++)
printk("mode 0x%x, size 0x%x, phys-addr %08x\n",
printk("mode 0x%x, size 0x%x, phys-addr %08Lx\n",
rrpriv->tx_ring[i].mode,
rrpriv->tx_ring[i].size,
rrpriv->tx_ring[i].addr.addrlo);
(unsigned long long) rrpriv->tx_ring[i].addr.addrlo);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment