git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
ixgb
/
ixgb.h
diff --git
a/drivers/net/ixgb/ixgb.h
b/drivers/net/ixgb/ixgb.h
index
3426020
..
f8d3385
100644
(file)
--- a/
drivers/net/ixgb/ixgb.h
+++ b/
drivers/net/ixgb/ixgb.h
@@
-1,7
+1,7
@@
/*******************************************************************************
/*******************************************************************************
- Copyright(c) 1999 - 200
4
Intel Corporation. All rights reserved.
+ Copyright(c) 1999 - 200
5
Intel Corporation. All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@
-110,7
+110,7
@@
struct ixgb_adapter;
#define IXGB_TX_QUEUE_WAKE 16
/* How many Rx Buffers do we bundle into one write to the hardware ? */
#define IXGB_TX_QUEUE_WAKE 16
/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IXGB_RX_BUFFER_WRITE
16
/* Must be power of 2 */
+#define IXGB_RX_BUFFER_WRITE
4
/* Must be power of 2 */
/* only works for sizes that are powers of 2 */
#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
/* only works for sizes that are powers of 2 */
#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
@@
-176,6
+176,7
@@
struct ixgb_adapter {
uint64_t hw_csum_tx_error;
uint32_t tx_int_delay;
boolean_t tx_int_delay_enable;
uint64_t hw_csum_tx_error;
uint32_t tx_int_delay;
boolean_t tx_int_delay_enable;
+ boolean_t detect_tx_hung;
/* RX */
struct ixgb_desc_ring rx_ring;
/* RX */
struct ixgb_desc_ring rx_ring;