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

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

drivers/net/e1000e/hw.h

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ struct e1000_hw { 


#ifdef DEBUG

#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

static inline int __attribute__ ((format (printf, 2, 3)))

hw_dbg(struct e1000_hw *hw, const char *format, ...)

drivers/net/e1000e/netdev.c

+1 −3
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ static const struct e1000_info *e1000_info_tbl[] = { 
 **/

char *e1000e_get_hw_dev_name(struct e1000_hw *hw)

{

	struct e1000_adapter *adapter = hw->back;

	struct net_device *netdev = adapter->netdev;

	return netdev->name;

	return hw->adapter->netdev->name;

}

#endif