aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r--drivers/net/e1000/e1000.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index c87f2cbdbae3..1a4f89c66a26 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -140,7 +140,7 @@ do { \
140#define E1000_FC_HIGH_DIFF 0x1638 /* High: 5688 bytes below Rx FIFO size */ 140#define E1000_FC_HIGH_DIFF 0x1638 /* High: 5688 bytes below Rx FIFO size */
141#define E1000_FC_LOW_DIFF 0x1640 /* Low: 5696 bytes below Rx FIFO size */ 141#define E1000_FC_LOW_DIFF 0x1640 /* Low: 5696 bytes below Rx FIFO size */
142 142
143#define E1000_FC_PAUSE_TIME 0x0680 /* 858 usec */ 143#define E1000_FC_PAUSE_TIME 0xFFFF /* pause for the max or until send xon */
144 144
145/* How many Tx Descriptors do we need to call netif_wake_queue ? */ 145/* How many Tx Descriptors do we need to call netif_wake_queue ? */
146#define E1000_TX_QUEUE_WAKE 16 146#define E1000_TX_QUEUE_WAKE 16
@@ -164,6 +164,7 @@ do { \
164struct e1000_buffer { 164struct e1000_buffer {
165 struct sk_buff *skb; 165 struct sk_buff *skb;
166 dma_addr_t dma; 166 dma_addr_t dma;
167 struct page *page;
167 unsigned long time_stamp; 168 unsigned long time_stamp;
168 u16 length; 169 u16 length;
169 u16 next_to_watch; 170 u16 next_to_watch;
@@ -205,6 +206,7 @@ struct e1000_rx_ring {
205 unsigned int next_to_clean; 206 unsigned int next_to_clean;
206 /* array of buffer information structs */ 207 /* array of buffer information structs */
207 struct e1000_buffer *buffer_info; 208 struct e1000_buffer *buffer_info;
209 struct sk_buff *rx_skb_top;
208 210
209 /* cpu for rx queue */ 211 /* cpu for rx queue */
210 int cpu; 212 int cpu;