diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
-rw-r--r-- | drivers/net/ixgb/ixgb.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index c83271b38621..a83ef28dadb0 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | 2 | ||
3 | 3 | ||
4 | Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. | 4 | Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved. |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify it | 6 | This program is free software; you can redistribute it and/or modify it |
7 | under the terms of the GNU General Public License as published by the Free | 7 | under the terms of the GNU General Public License as published by the Free |
@@ -84,7 +84,12 @@ struct ixgb_adapter; | |||
84 | #define IXGB_DBG(args...) | 84 | #define IXGB_DBG(args...) |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args) | 87 | #define PFX "ixgb: " |
88 | #define DPRINTK(nlevel, klevel, fmt, args...) \ | ||
89 | (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ | ||
90 | printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ | ||
91 | __FUNCTION__ , ## args)) | ||
92 | |||
88 | 93 | ||
89 | /* TX/RX descriptor defines */ | 94 | /* TX/RX descriptor defines */ |
90 | #define DEFAULT_TXD 256 | 95 | #define DEFAULT_TXD 256 |
@@ -175,6 +180,7 @@ struct ixgb_adapter { | |||
175 | uint64_t hw_csum_tx_good; | 180 | uint64_t hw_csum_tx_good; |
176 | uint64_t hw_csum_tx_error; | 181 | uint64_t hw_csum_tx_error; |
177 | uint32_t tx_int_delay; | 182 | uint32_t tx_int_delay; |
183 | uint32_t tx_timeout_count; | ||
178 | boolean_t tx_int_delay_enable; | 184 | boolean_t tx_int_delay_enable; |
179 | boolean_t detect_tx_hung; | 185 | boolean_t detect_tx_hung; |
180 | 186 | ||
@@ -192,7 +198,9 @@ struct ixgb_adapter { | |||
192 | 198 | ||
193 | /* structs defined in ixgb_hw.h */ | 199 | /* structs defined in ixgb_hw.h */ |
194 | struct ixgb_hw hw; | 200 | struct ixgb_hw hw; |
201 | u16 msg_enable; | ||
195 | struct ixgb_hw_stats stats; | 202 | struct ixgb_hw_stats stats; |
203 | uint32_t alloc_rx_buff_failed; | ||
196 | #ifdef CONFIG_PCI_MSI | 204 | #ifdef CONFIG_PCI_MSI |
197 | boolean_t have_msi; | 205 | boolean_t have_msi; |
198 | #endif | 206 | #endif |