diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
| commit | 1a0153507ffae9cf3350e76c12d441788c0191e1 (patch) | |
| tree | d05a502b4fc05202c84c1667019460c08ea088cd /drivers/net/atp.c | |
| parent | b0683ac8928c4cf40646a6ce3eb6ffe94605acfa (diff) | |
v2.4.3.2 -> v2.4.3.3
- Hui-Fen Hsu: sis900 driver update
- NIIBE Yutaka: Super-H update
- Alan Cox: more resyncs (ARM down, but more to go)
- David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc.
- David Miller/me: get rid of various drivers hacks to do mmap
alignment behind the back of the VM layer. Create a real
protocol for it.
Diffstat (limited to 'drivers/net/atp.c')
| -rw-r--r-- | drivers/net/atp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 518431f8f5ec..9bf065e1355f 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c @@ -209,7 +209,7 @@ static void tx_timeout(struct net_device *dev); /* A list of all installed ATP devices, for removing the driver module. */ -static struct net_device *root_atp_dev = NULL; +static struct net_device *root_atp_dev; /* Check for a network adapter of this type, and return '0' iff one exists. If dev->base_addr == 0, probe all likely locations. @@ -584,7 +584,7 @@ static void atp_interrupt(int irq, void *dev_instance, struct pt_regs * regs) struct net_device *dev = (struct net_device *)dev_instance; struct net_local *lp; long ioaddr; - static int num_tx_since_rx = 0; + static int num_tx_since_rx; int boguscount = max_interrupt_work; if (dev == NULL) { |