diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/net/atp.h | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/net/atp.h')
| -rw-r--r-- | drivers/net/atp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/atp.h b/drivers/net/atp.h index 8a74d4451..46801e401 100644 --- a/drivers/net/atp.h +++ b/drivers/net/atp.h @@ -4,15 +4,14 @@ struct net_local { -#ifdef __KERNEL__ struct net_device_stats stats; -#endif ushort saved_tx_size; unsigned char re_tx, /* Number of packet retransmissions. */ tx_unit_busy, addr_mode, /* Current Rx filter e.g. promiscuous, etc. */ pac_cnt_in_tx_buf; + spinlock_t lock; /* Safety lock */ }; struct rx_header { @@ -52,8 +51,7 @@ enum page0_regs CMR2_h = 0x1d, }; -enum eepage_regs -{ PROM_CMD = 6, PROM_DATA = 7 }; /* Note that PROM_CMD is in the "high" bits. */ +enum eepage_regs { PROM_CMD = 6, PROM_DATA = 7 }; /* Note that PROM_CMD is in the "high" bits. */ #define ISR_TxOK 0x01 |