Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b453368d authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ixgbe: fix build when DEBUG is defined 



The ixgbe driver had issues when DEBUG was defined because the hw_dbg macro
was incomplete.  This patch completes the code based off of the code that
already existed in the igb module.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fe7c4c9

drivers/net/ixgbe/ixgbe_common.h

+3 −6
Original line number Diff line number Diff line
@@ -96,14 +96,11 @@ s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val); 
#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)



#ifdef DEBUG

extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw);

#define hw_dbg(hw, format, arg...) \

printk(KERN_DEBUG, "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg);

	printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg)

#else

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

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

{

	return 0;

}

#define hw_dbg(hw, format, arg...) do {} while (0)

#endif



#endif /* IXGBE_COMMON */

drivers/net/ixgbe/ixgbe_main.c

+12 −0
Original line number Diff line number Diff line
@@ -4987,8 +4987,20 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event, 


	return ret_val ? NOTIFY_BAD : NOTIFY_DONE;

}



#endif /* CONFIG_IXGBE_DCA */

#ifdef DEBUG

/**

 * ixgbe_get_hw_dev_name - return device name string

 * used by hardware layer to print debugging information

 **/

char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	return adapter->netdev->name;

}



#endif

module_exit(ixgbe_exit_module);



/* ixgbe_main.c */