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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
ixgb
/
ixgb.h
diff --git
a/drivers/net/ixgb/ixgb.h
b/drivers/net/ixgb/ixgb.h
index
c83271b
..
82b67af
100644
(file)
--- a/
drivers/net/ixgb/ixgb.h
+++ b/
drivers/net/ixgb/ixgb.h
@@
-1,7
+1,7
@@
/*******************************************************************************
/*******************************************************************************
- Copyright(c) 1999 - 200
5
Intel Corporation. All rights reserved.
+ Copyright(c) 1999 - 200
6
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
@@
-30,7
+30,6
@@
#define _IXGB_H_
#include <linux/stddef.h>
#define _IXGB_H_
#include <linux/stddef.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <asm/byteorder.h>
#include <linux/module.h>
#include <linux/types.h>
#include <asm/byteorder.h>
@@
-84,7
+83,12
@@
struct ixgb_adapter;
#define IXGB_DBG(args...)
#endif
#define IXGB_DBG(args...)
#endif
-#define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args)
+#define PFX "ixgb: "
+#define DPRINTK(nlevel, klevel, fmt, args...) \
+ (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
+ printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
+ __FUNCTION__ , ## args))
+
/* TX/RX descriptor defines */
#define DEFAULT_TXD 256
/* TX/RX descriptor defines */
#define DEFAULT_TXD 256
@@
-175,6
+179,7
@@
struct ixgb_adapter {
uint64_t hw_csum_tx_good;
uint64_t hw_csum_tx_error;
uint32_t tx_int_delay;
uint64_t hw_csum_tx_good;
uint64_t hw_csum_tx_error;
uint32_t tx_int_delay;
+ uint32_t tx_timeout_count;
boolean_t tx_int_delay_enable;
boolean_t detect_tx_hung;
boolean_t tx_int_delay_enable;
boolean_t detect_tx_hung;
@@
-192,7
+197,9
@@
struct ixgb_adapter {
/* structs defined in ixgb_hw.h */
struct ixgb_hw hw;
/* structs defined in ixgb_hw.h */
struct ixgb_hw hw;
+ u16 msg_enable;
struct ixgb_hw_stats stats;
struct ixgb_hw_stats stats;
+ uint32_t alloc_rx_buff_failed;
#ifdef CONFIG_PCI_MSI
boolean_t have_msi;
#endif
#ifdef CONFIG_PCI_MSI
boolean_t have_msi;
#endif