diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/net/sunbmac.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/net/sunbmac.h')
| -rw-r--r-- | drivers/net/sunbmac.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h index 2e452f39c..f1d878c66 100644 --- a/drivers/net/sunbmac.h +++ b/drivers/net/sunbmac.h @@ -1,4 +1,4 @@ -/* $Id: sunbmac.h,v 1.5 1999/09/21 14:36:26 davem Exp $ +/* $Id: sunbmac.h,v 1.6 2000/02/09 11:15:36 davem Exp $ * sunbmac.h: Defines for the Sun "Big MAC" 100baseT ethernet cards. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -310,6 +310,8 @@ struct bigmac { struct bmac_init_block *bmac_block; /* RX and TX descriptors */ __u32 bblock_dvma; /* RX and TX descriptors */ + spinlock_t lock; + struct sk_buff *rx_skbs[RX_RING_SIZE]; struct sk_buff *tx_skbs[TX_RING_SIZE]; |