git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
drivers
/
net
/
qlge
/
qlge.h
diff --git
a/drivers/net/qlge/qlge.h
b/drivers/net/qlge/qlge.h
index
d328507
..
ca306fd
100644
(file)
--- a/
drivers/net/qlge/qlge.h
+++ b/
drivers/net/qlge/qlge.h
@@
-16,7
+16,7
@@
*/
#define DRV_NAME "qlge"
#define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver "
*/
#define DRV_NAME "qlge"
#define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION "v1.00.00.2
7
.00.00-01"
+#define DRV_VERSION "v1.00.00.2
9
.00.00-01"
#define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */
#define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */
@@
-1996,6
+1996,7
@@
enum {
QL_LB_LINK_UP = 10,
QL_FRC_COREDUMP = 11,
QL_EEH_FATAL = 12,
QL_LB_LINK_UP = 10,
QL_FRC_COREDUMP = 11,
QL_EEH_FATAL = 12,
+ QL_ASIC_RECOVERY = 14, /* We are in ascic recovery. */
};
/* link_status bit definitions */
};
/* link_status bit definitions */