Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26997
b: refs/heads/master
c: 74ef872
h: refs/heads/master
i:
  26995: 1cba05f
v: v3
  • Loading branch information
Klaus Wacker authored and Jeff Garzik committed May 27, 2006
1 parent a8c464c commit c972f19
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27eb5ac8f015687205a51425620064c711784956
refs/heads/master: 74ef872c8f250acc02add54ff9d96f31d17bfeb3
14 changes: 9 additions & 5 deletions trunk/drivers/s390/net/lcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,17 @@ do { \
/**
* LCS sense byte definitions
*/
#define LCS_SENSE_BYTE_0 0
#define LCS_SENSE_BYTE_1 1
#define LCS_SENSE_BYTE_2 2
#define LCS_SENSE_BYTE_3 3
#define LCS_SENSE_INTERFACE_DISCONNECT 0x01
#define LCS_SENSE_EQUIPMENT_CHECK 0x10
#define LCS_SENSE_BUS_OUT_CHECK 0x20
#define LCS_SENSE_INTERVENTION_REQUIRED 0x40
#define LCS_SENSE_CMD_REJECT 0x80
#define LCS_SENSE_RESETTING_EVENT 0x0080
#define LCS_SENSE_DEVICE_ONLINE 0x0020
#define LCS_SENSE_RESETTING_EVENT 0x80
#define LCS_SENSE_DEVICE_ONLINE 0x20

/**
* LCS packet type definitions
Expand Down Expand Up @@ -152,10 +156,9 @@ enum lcs_dev_states {

enum lcs_threads {
LCS_SET_MC_THREAD = 1,
LCS_STARTLAN_THREAD = 2,
LCS_STOPLAN_THREAD = 4,
LCS_STARTUP_THREAD = 8,
LCS_RECOVERY_THREAD = 2,
};

/**
* LCS struct declarations
*/
Expand Down Expand Up @@ -286,6 +289,7 @@ struct lcs_card {
struct net_device_stats stats;
unsigned short (*lan_type_trans)(struct sk_buff *skb,
struct net_device *dev);
struct ccwgroup_device *gdev;
struct lcs_channel read;
struct lcs_channel write;
struct lcs_buffer *tx_buffer;
Expand Down

0 comments on commit c972f19

Please sign in to comment.