diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2010-07-01 16:05:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-05 21:50:55 -0400 |
commit | 396e799c3ac29f970c40bde87b76f4652c06df76 (patch) | |
tree | c1eb2f147cd6f9610e90711e96e450ba89cb19df /drivers/net/ixgbe/ixgbe_common.h | |
parent | 4478a9cdf007a0418755a8a4016af8352fb1c1f3 (diff) |
ixgbe: use netif_<level> instead of netdev_<level>
This patch restores the ability to set msglvl through ethtool.
The issue was introduced by:
commit 849c45423c0c108e08d67644728cc9b0ed225fa1
CC: Joe Perches <joe@perches.com>
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h index d5d3aae8524b..5cf15aa11cac 100644 --- a/drivers/net/ixgbe/ixgbe_common.h +++ b/drivers/net/ixgbe/ixgbe_common.h | |||
@@ -108,16 +108,6 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index); | |||
108 | extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw); | 108 | extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw); |
109 | #define hw_dbg(hw, format, arg...) \ | 109 | #define hw_dbg(hw, format, arg...) \ |
110 | netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg) | 110 | netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg) |
111 | #define e_err(format, arg...) \ | ||
112 | netdev_err(adapter->netdev, format, ## arg) | ||
113 | #define e_info(format, arg...) \ | ||
114 | netdev_info(adapter->netdev, format, ## arg) | ||
115 | #define e_warn(format, arg...) \ | ||
116 | netdev_warn(adapter->netdev, format, ## arg) | ||
117 | #define e_notice(format, arg...) \ | ||
118 | netdev_notice(adapter->netdev, format, ## arg) | ||
119 | #define e_crit(format, arg...) \ | ||
120 | netdev_crit(adapter->netdev, format, ## arg) | ||
121 | #define e_dev_info(format, arg...) \ | 111 | #define e_dev_info(format, arg...) \ |
122 | dev_info(&adapter->pdev->dev, format, ## arg) | 112 | dev_info(&adapter->pdev->dev, format, ## arg) |
123 | #define e_dev_warn(format, arg...) \ | 113 | #define e_dev_warn(format, arg...) \ |
@@ -126,5 +116,12 @@ extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw); | |||
126 | dev_err(&adapter->pdev->dev, format, ## arg) | 116 | dev_err(&adapter->pdev->dev, format, ## arg) |
127 | #define e_dev_notice(format, arg...) \ | 117 | #define e_dev_notice(format, arg...) \ |
128 | dev_notice(&adapter->pdev->dev, format, ## arg) | 118 | dev_notice(&adapter->pdev->dev, format, ## arg) |
129 | 119 | #define e_info(msglvl, format, arg...) \ | |
120 | netif_info(adapter, msglvl, adapter->netdev, format, ## arg) | ||
121 | #define e_err(msglvl, format, arg...) \ | ||
122 | netif_err(adapter, msglvl, adapter->netdev, format, ## arg) | ||
123 | #define e_warn(msglvl, format, arg...) \ | ||
124 | netif_warn(adapter, msglvl, adapter->netdev, format, ## arg) | ||
125 | #define e_crit(msglvl, format, arg...) \ | ||
126 | netif_crit(adapter, msglvl, adapter->netdev, format, ## arg) | ||
130 | #endif /* IXGBE_COMMON */ | 127 | #endif /* IXGBE_COMMON */ |