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

Commit 51057e5d authored Nov 25, 2011 by Johannes Berg Committed by Wey-Yi Guy Dec 02, 2011

iwlagn: remove MACDUMP debug



This is only used for TX debugging where there
already is more debugging and tracing is more
useful anyway, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

parent 6e66bb4a

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,7 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
	#define IWL_DL_HCMD (1 << 2)		#define IWL_DL_HCMD (1 << 2)
	#define IWL_DL_STATE (1 << 3)		#define IWL_DL_STATE (1 << 3)
	/* 0x000000F0 - 0x00000010 */		/* 0x000000F0 - 0x00000010 */
	#define IWL_DL_MACDUMP (1 << 4)		/* unused (1 << 4) */
	/* unused (1 << 5) */		/* unused (1 << 5) */
	#define IWL_DL_EEPROM (1 << 6)		#define IWL_DL_EEPROM (1 << 6)
	#define IWL_DL_RADIO (1 << 7)		#define IWL_DL_RADIO (1 << 7)
	@@ -175,7 +175,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)

	#define IWL_DEBUG_INFO(p, f, a...) IWL_DEBUG(p, IWL_DL_INFO, f, ## a)		#define IWL_DEBUG_INFO(p, f, a...) IWL_DEBUG(p, IWL_DL_INFO, f, ## a)
	#define IWL_DEBUG_MAC80211(p, f, a...) IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)		#define IWL_DEBUG_MAC80211(p, f, a...) IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)
	#define IWL_DEBUG_MACDUMP(p, f, a...) IWL_DEBUG(p, IWL_DL_MACDUMP, f, ## a)
	#define IWL_DEBUG_TEMP(p, f, a...) IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)		#define IWL_DEBUG_TEMP(p, f, a...) IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)
	#define IWL_DEBUG_SCAN(p, f, a...) IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)		#define IWL_DEBUG_SCAN(p, f, a...) IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)
	#define IWL_DEBUG_RX(p, f, a...) IWL_DEBUG(p, IWL_DL_RX, f, ## a)		#define IWL_DEBUG_RX(p, f, a...) IWL_DEBUG(p, IWL_DL_RX, f, ## a)

drivers/net/wireless/iwlwifi/iwl-mac80211.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -481,15 +481,11 @@ static void iwlagn_mac_tx(struct ieee80211_hw hw, struct sk_buff skb)
	{		{
	struct iwl_priv *priv = hw->priv;		struct iwl_priv *priv = hw->priv;

	IWL_DEBUG_MACDUMP(priv, "enter\n");

	IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,		IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
	ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);		ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);

	if (iwlagn_tx_skb(priv, skb))		if (iwlagn_tx_skb(priv, skb))
	dev_kfree_skb_any(skb);		dev_kfree_skb_any(skb);

	IWL_DEBUG_MACDUMP(priv, "leave\n");
	}		}

	static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,		static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,