Commit c88af3fb authored by Anton Blanchard's avatar Anton Blanchard

pcnet32 net driver updates 2/6:

irq could overflow unsigned char, change to unsigned int
ioaddr could overflow unsigned int, change to unsigned long
parent 6235c39e
...@@ -323,7 +323,7 @@ struct pcnet32_private { ...@@ -323,7 +323,7 @@ struct pcnet32_private {
static void pcnet32_probe_vlbus(void); static void pcnet32_probe_vlbus(void);
static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *); static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
static int pcnet32_probe1(unsigned long, unsigned char, int, struct pci_dev *); static int pcnet32_probe1(unsigned long, unsigned int, int, struct pci_dev *);
static int pcnet32_open(struct net_device *); static int pcnet32_open(struct net_device *);
static int pcnet32_init_ring(struct net_device *); static int pcnet32_init_ring(struct net_device *);
static int pcnet32_start_xmit(struct sk_buff *, struct net_device *); static int pcnet32_start_xmit(struct sk_buff *, struct net_device *);
...@@ -507,7 +507,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -507,7 +507,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
* pdev will be NULL when called from pcnet32_probe_vlbus. * pdev will be NULL when called from pcnet32_probe_vlbus.
*/ */
static int __devinit static int __devinit
pcnet32_probe1(unsigned long ioaddr, unsigned char irq_line, int shared, pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
struct pci_dev *pdev) struct pci_dev *pdev)
{ {
struct pcnet32_private *lp; struct pcnet32_private *lp;
...@@ -1022,7 +1022,7 @@ static void ...@@ -1022,7 +1022,7 @@ static void
pcnet32_tx_timeout (struct net_device *dev) pcnet32_tx_timeout (struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = dev->priv;
unsigned int ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
/* Transmitter timeout, serious problems. */ /* Transmitter timeout, serious problems. */
printk(KERN_ERR "%s: transmit timed out, status %4.4x, resetting.\n", printk(KERN_ERR "%s: transmit timed out, status %4.4x, resetting.\n",
...@@ -1055,7 +1055,7 @@ static int ...@@ -1055,7 +1055,7 @@ static int
pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = dev->priv;
unsigned int ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
u16 status; u16 status;
int entry; int entry;
unsigned long flags; unsigned long flags;
......
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