diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/net/tokenring/olympic.h | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/net/tokenring/olympic.h')
| -rw-r--r-- | drivers/net/tokenring/olympic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tokenring/olympic.h b/drivers/net/tokenring/olympic.h index d5a06423a..ba83366c7 100644 --- a/drivers/net/tokenring/olympic.h +++ b/drivers/net/tokenring/olympic.h @@ -245,6 +245,8 @@ struct olympic_private { __u8 *olympic_lap; char *olympic_card_name ; + spinlock_t olympic_lock ; + volatile int srb_queued; /* True if an SRB is still posted */ wait_queue_head_t srb_wait; @@ -265,7 +267,6 @@ struct olympic_private { __u8 olympic_ring_speed ; __u16 pkt_buf_sz ; __u8 olympic_receive_options, olympic_copy_all_options, olympic_message_level; - __u8 olympic_multicast_set ; __u16 olympic_addr_table_addr, olympic_parms_addr ; __u8 olympic_laa[6] ; }; |