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

Commit cb299bae authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: move iwl_print_hex_dump to iwl-debug.h 



This patch moves iwl_print_hex_dump to iwl-debug.h
where it belongs

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e720ce9d

drivers/net/wireless/iwlwifi/iwl-debug.h

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ do { if ((priv->debug_level & (level)) && net_ratelimit()) \ 
  dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), "%c %s " fmt, \

	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)



#define iwl_print_hex_dump(priv, level, p, len) 			\

do {                                            			\

	if (priv->debug_level & level)          			\

		print_hex_dump(KERN_DEBUG, "iwl data: ",		\

			       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);	\

} while (0)



#ifdef CONFIG_IWLWIFI_DEBUGFS

struct iwl_debugfs {

	const char *name;
@@ -70,6 +77,9 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv); 
#else

#define IWL_DEBUG(level, fmt, args...)

#define IWL_DEBUG_LIMIT(level, fmt, args...)

static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,

				      void *p, u32 len)

{}

#endif				/* CONFIG_IWLWIFI_DEBUG */

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −17
Original line number Diff line number Diff line
@@ -1089,23 +1089,6 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch) 
	return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;

}



#ifdef CONFIG_IWLWIFI_DEBUG

static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,

				      void *p, u32 len)

{

	if (!(priv->debug_level & level))

		return;



	print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,

			p, len, 1);

}

#else

static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,

				      void *p, u32 len)

{

}

#endif



extern const struct iwl_channel_info *iwl_get_channel_info(

	const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);