diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
| commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
| tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/net/qlge/qlge.h | |
| parent | 0d83ab65ff1b54ce8b6cd172285cf71a38c4cceb (diff) | |
| parent | bfe159a51203c15d23cb3158fffdc25ec4b4dda1 (diff) | |
Merge branch 'scsi-fixes'
Diffstat (limited to 'drivers/net/qlge/qlge.h')
| -rw-r--r-- | drivers/net/qlge/qlge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index d32850715f5c..ca306fd5f588 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | #define DRV_NAME "qlge" | 17 | #define DRV_NAME "qlge" |
| 18 | #define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver " | 18 | #define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver " |
| 19 | #define DRV_VERSION "v1.00.00.27.00.00-01" | 19 | #define DRV_VERSION "v1.00.00.29.00.00-01" |
| 20 | 20 | ||
| 21 | #define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */ | 21 | #define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */ |
| 22 | 22 | ||
| @@ -1996,6 +1996,7 @@ enum { | |||
| 1996 | QL_LB_LINK_UP = 10, | 1996 | QL_LB_LINK_UP = 10, |
| 1997 | QL_FRC_COREDUMP = 11, | 1997 | QL_FRC_COREDUMP = 11, |
| 1998 | QL_EEH_FATAL = 12, | 1998 | QL_EEH_FATAL = 12, |
| 1999 | QL_ASIC_RECOVERY = 14, /* We are in ascic recovery. */ | ||
| 1999 | }; | 2000 | }; |
| 2000 | 2001 | ||
| 2001 | /* link_status bit definitions */ | 2002 | /* link_status bit definitions */ |