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

Commit ae80031a authored by Robert P. J. Day's avatar Robert P. J. Day Committed by John W. Linville
Browse files

[PATCH] Rename IPW2100 debugging macros to not look like config options. 



  Rename some internal ipw2100 debugging macros to not look like
user-settable kernel config settings.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 48f33c95

drivers/net/wireless/ipw2100.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ that only one external action is invoked at a time. 




/* Debugging stuff */

/* Debugging stuff */

#ifdef CONFIG_IPW2100_DEBUG

#ifdef CONFIG_IPW2100_DEBUG

#define CONFIG_IPW2100_RX_DEBUG	/* Reception debugging */

#define IPW2100_RX_DEBUG	/* Reception debugging */

#endif

#endif





MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -2239,7 +2239,7 @@ static void ipw2100_snapshot_free(struct ipw2100_priv *priv) 
	priv->snapshot[0] = NULL;

	priv->snapshot[0] = NULL;

}

}





#ifdef CONFIG_IPW2100_DEBUG_C3

#ifdef IPW2100_DEBUG_C3

static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)

static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)

{

{

	int i;

	int i;
@@ -2314,13 +2314,13 @@ static u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 * in_buf, 
 * The size of the constructed ethernet

 * The size of the constructed ethernet

 *

 *

 */

 */

#ifdef CONFIG_IPW2100_RX_DEBUG

#ifdef IPW2100_RX_DEBUG

static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];

static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];

#endif

#endif





static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)

static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)

{

{

#ifdef CONFIG_IPW2100_DEBUG_C3

#ifdef IPW2100_DEBUG_C3

	struct ipw2100_status *status = &priv->status_queue.drv[i];

	struct ipw2100_status *status = &priv->status_queue.drv[i];

	u32 match, reg;

	u32 match, reg;

	int j;

	int j;
@@ -2342,7 +2342,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i) 
	}

	}

#endif

#endif





#ifdef CONFIG_IPW2100_DEBUG_C3

#ifdef IPW2100_DEBUG_C3

	/* Halt the fimrware so we can get a good image */

	/* Halt the fimrware so we can get a good image */

	write_register(priv->net_dev, IPW_REG_RESET_REG,

	write_register(priv->net_dev, IPW_REG_RESET_REG,

		       IPW_AUX_HOST_RESET_REG_STOP_MASTER);

		       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
@@ -2413,7 +2413,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i, 




	skb_put(packet->skb, status->frame_size);

	skb_put(packet->skb, status->frame_size);





#ifdef CONFIG_IPW2100_RX_DEBUG

#ifdef IPW2100_RX_DEBUG

	/* Make a copy of the frame so we can dump it to the logs if

	/* Make a copy of the frame so we can dump it to the logs if

	 * ieee80211_rx fails */

	 * ieee80211_rx fails */

	memcpy(packet_data, packet->skb->data,

	memcpy(packet_data, packet->skb->data,
@@ -2421,7 +2421,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i, 
#endif

#endif





	if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {

	if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {

#ifdef CONFIG_IPW2100_RX_DEBUG

#ifdef IPW2100_RX_DEBUG

		IPW_DEBUG_DROP("%s: Non consumed packet:\n",

		IPW_DEBUG_DROP("%s: Non consumed packet:\n",

			       priv->net_dev->name);

			       priv->net_dev->name);

		printk_buf(IPW_DL_DROP, packet_data, status->frame_size);

		printk_buf(IPW_DL_DROP, packet_data, status->frame_size);
@@ -4912,7 +4912,7 @@ static int ipw2100_set_power_mode(struct ipw2100_priv *priv, int power_level) 
	else

	else

		priv->power_mode = IPW_POWER_ENABLED | power_level;

		priv->power_mode = IPW_POWER_ENABLED | power_level;





#ifdef CONFIG_IPW2100_TX_POWER

#ifdef IPW2100_TX_POWER

	if (priv->port_type == IBSS && priv->adhoc_power != DFTL_IBSS_TX_POWER) {

	if (priv->port_type == IBSS && priv->adhoc_power != DFTL_IBSS_TX_POWER) {

		/* Set beacon interval */

		/* Set beacon interval */

		cmd.host_command = TX_POWER_INDEX;

		cmd.host_command = TX_POWER_INDEX;