Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e8e83d1 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

82596 warning fixes 



drivers/net/82596.c: In function 'i596_start_xmit':
drivers/net/82596.c:1069: warning: cast from pointer to integer of different size
drivers/net/82596.c: In function 'i82596_probe':
drivers/net/82596.c:1249: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b1f54ba3

drivers/net/82596.c

+4 −3
Original line number Diff line number Diff line
@@ -1066,8 +1066,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	short length = skb->len;

	dev->trans_start = jiffies;



	DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name,

				skb->len, (unsigned int)skb->data));

	DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n",

				dev->name, skb->len, skb->data));



	if (skb->len < ETH_ZLEN) {

		if (skb_padto(skb, ETH_ZLEN))
@@ -1246,7 +1246,8 @@ struct net_device * __init i82596_probe(int unit) 
	dev->priv = (void *)(dev->mem_start);



	lp = dev->priv;

	DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n",

	DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%zd bytes), "

			"lp->scb at 0x%08lx\n",

			dev->name, (unsigned long)lp,

			sizeof(struct i596_private), (unsigned long)&lp->scb));

	memset((void *) lp, 0, sizeof(struct i596_private));