Commit 589c085f authored by Auke Kok's avatar Auke Kok Committed by David S. Miller

e1000e: fix debugging printout code

A small bug crawled in the -DDEBUG enabled code. Fix this to
properly call the backreference device name.
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 28692ec4
...@@ -852,7 +852,7 @@ struct e1000_hw { ...@@ -852,7 +852,7 @@ struct e1000_hw {
#ifdef DEBUG #ifdef DEBUG
#define hw_dbg(hw, format, arg...) \ #define hw_dbg(hw, format, arg...) \
printk(KERN_DEBUG, "%s: " format, e1000_get_hw_dev_name(hw), ##arg); printk(KERN_DEBUG, "%s: " format, e1000e_get_hw_dev_name(hw), ##arg);
#else #else
static inline int __attribute__ ((format (printf, 2, 3))) static inline int __attribute__ ((format (printf, 2, 3)))
hw_dbg(struct e1000_hw *hw, const char *format, ...) hw_dbg(struct e1000_hw *hw, const char *format, ...)
......
...@@ -66,9 +66,7 @@ static const struct e1000_info *e1000_info_tbl[] = { ...@@ -66,9 +66,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
**/ **/
char *e1000e_get_hw_dev_name(struct e1000_hw *hw) char *e1000e_get_hw_dev_name(struct e1000_hw *hw)
{ {
struct e1000_adapter *adapter = hw->back; return hw->adapter->netdev->name;
struct net_device *netdev = adapter->netdev;
return netdev->name;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment