diff options
author | Klaus Wacker <kdwacker@de.ibm.com> | 2006-05-24 03:51:21 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:57:45 -0400 |
commit | 74ef872c8f250acc02add54ff9d96f31d17bfeb3 (patch) | |
tree | aea207d99f78ce9f741a3dd5dcce9748634c091e /drivers/s390 | |
parent | 27eb5ac8f015687205a51425620064c711784956 (diff) |
[PATCH] s390: lcs driver bug fixes and improvements [2/2]
This is the second lcs driver patch containing the rest of lcs fixes.
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/lcs.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h index 2fad5e40c2e4..93143932983b 100644 --- a/drivers/s390/net/lcs.h +++ b/drivers/s390/net/lcs.h | |||
@@ -73,13 +73,17 @@ do { \ | |||
73 | /** | 73 | /** |
74 | * LCS sense byte definitions | 74 | * LCS sense byte definitions |
75 | */ | 75 | */ |
76 | #define LCS_SENSE_BYTE_0 0 | ||
77 | #define LCS_SENSE_BYTE_1 1 | ||
78 | #define LCS_SENSE_BYTE_2 2 | ||
79 | #define LCS_SENSE_BYTE_3 3 | ||
76 | #define LCS_SENSE_INTERFACE_DISCONNECT 0x01 | 80 | #define LCS_SENSE_INTERFACE_DISCONNECT 0x01 |
77 | #define LCS_SENSE_EQUIPMENT_CHECK 0x10 | 81 | #define LCS_SENSE_EQUIPMENT_CHECK 0x10 |
78 | #define LCS_SENSE_BUS_OUT_CHECK 0x20 | 82 | #define LCS_SENSE_BUS_OUT_CHECK 0x20 |
79 | #define LCS_SENSE_INTERVENTION_REQUIRED 0x40 | 83 | #define LCS_SENSE_INTERVENTION_REQUIRED 0x40 |
80 | #define LCS_SENSE_CMD_REJECT 0x80 | 84 | #define LCS_SENSE_CMD_REJECT 0x80 |
81 | #define LCS_SENSE_RESETTING_EVENT 0x0080 | 85 | #define LCS_SENSE_RESETTING_EVENT 0x80 |
82 | #define LCS_SENSE_DEVICE_ONLINE 0x0020 | 86 | #define LCS_SENSE_DEVICE_ONLINE 0x20 |
83 | 87 | ||
84 | /** | 88 | /** |
85 | * LCS packet type definitions | 89 | * LCS packet type definitions |
@@ -152,10 +156,9 @@ enum lcs_dev_states { | |||
152 | 156 | ||
153 | enum lcs_threads { | 157 | enum lcs_threads { |
154 | LCS_SET_MC_THREAD = 1, | 158 | LCS_SET_MC_THREAD = 1, |
155 | LCS_STARTLAN_THREAD = 2, | 159 | LCS_RECOVERY_THREAD = 2, |
156 | LCS_STOPLAN_THREAD = 4, | ||
157 | LCS_STARTUP_THREAD = 8, | ||
158 | }; | 160 | }; |
161 | |||
159 | /** | 162 | /** |
160 | * LCS struct declarations | 163 | * LCS struct declarations |
161 | */ | 164 | */ |
@@ -286,6 +289,7 @@ struct lcs_card { | |||
286 | struct net_device_stats stats; | 289 | struct net_device_stats stats; |
287 | unsigned short (*lan_type_trans)(struct sk_buff *skb, | 290 | unsigned short (*lan_type_trans)(struct sk_buff *skb, |
288 | struct net_device *dev); | 291 | struct net_device *dev); |
292 | struct ccwgroup_device *gdev; | ||
289 | struct lcs_channel read; | 293 | struct lcs_channel read; |
290 | struct lcs_channel write; | 294 | struct lcs_channel write; |
291 | struct lcs_buffer *tx_buffer; | 295 | struct lcs_buffer *tx_buffer; |