diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-01-31 02:39:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-02-07 15:23:54 -0500 |
commit | ae80031a171b81d28b92877e7a9ce9b26cbfe051 (patch) | |
tree | 1019a7c4770ba4de02ab40550f90458589ab57ae | |
parent | 48f33c95291e429963dcd2dfe625d189d83e3925 (diff) |
[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: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index b85857a84870..d0639a45cd2c 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -175,7 +175,7 @@ that only one external action is invoked at a time. | |||
175 | 175 | ||
176 | /* Debugging stuff */ | 176 | /* Debugging stuff */ |
177 | #ifdef CONFIG_IPW2100_DEBUG | 177 | #ifdef CONFIG_IPW2100_DEBUG |
178 | #define CONFIG_IPW2100_RX_DEBUG /* Reception debugging */ | 178 | #define IPW2100_RX_DEBUG /* Reception debugging */ |
179 | #endif | 179 | #endif |
180 | 180 | ||
181 | MODULE_DESCRIPTION(DRV_DESCRIPTION); | 181 | MODULE_DESCRIPTION(DRV_DESCRIPTION); |
@@ -2239,7 +2239,7 @@ static void ipw2100_snapshot_free(struct ipw2100_priv *priv) | |||
2239 | priv->snapshot[0] = NULL; | 2239 | priv->snapshot[0] = NULL; |
2240 | } | 2240 | } |
2241 | 2241 | ||
2242 | #ifdef CONFIG_IPW2100_DEBUG_C3 | 2242 | #ifdef IPW2100_DEBUG_C3 |
2243 | static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv) | 2243 | static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv) |
2244 | { | 2244 | { |
2245 | int i; | 2245 | int i; |
@@ -2314,13 +2314,13 @@ static u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 * in_buf, | |||
2314 | * The size of the constructed ethernet | 2314 | * The size of the constructed ethernet |
2315 | * | 2315 | * |
2316 | */ | 2316 | */ |
2317 | #ifdef CONFIG_IPW2100_RX_DEBUG | 2317 | #ifdef IPW2100_RX_DEBUG |
2318 | static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH]; | 2318 | static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH]; |
2319 | #endif | 2319 | #endif |
2320 | 2320 | ||
2321 | static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i) | 2321 | static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i) |
2322 | { | 2322 | { |
2323 | #ifdef CONFIG_IPW2100_DEBUG_C3 | 2323 | #ifdef IPW2100_DEBUG_C3 |
2324 | struct ipw2100_status *status = &priv->status_queue.drv[i]; | 2324 | struct ipw2100_status *status = &priv->status_queue.drv[i]; |
2325 | u32 match, reg; | 2325 | u32 match, reg; |
2326 | int j; | 2326 | int j; |
@@ -2342,7 +2342,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i) | |||
2342 | } | 2342 | } |
2343 | #endif | 2343 | #endif |
2344 | 2344 | ||
2345 | #ifdef CONFIG_IPW2100_DEBUG_C3 | 2345 | #ifdef IPW2100_DEBUG_C3 |
2346 | /* Halt the fimrware so we can get a good image */ | 2346 | /* Halt the fimrware so we can get a good image */ |
2347 | write_register(priv->net_dev, IPW_REG_RESET_REG, | 2347 | write_register(priv->net_dev, IPW_REG_RESET_REG, |
2348 | IPW_AUX_HOST_RESET_REG_STOP_MASTER); | 2348 | IPW_AUX_HOST_RESET_REG_STOP_MASTER); |
@@ -2413,7 +2413,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i, | |||
2413 | 2413 | ||
2414 | skb_put(packet->skb, status->frame_size); | 2414 | skb_put(packet->skb, status->frame_size); |
2415 | 2415 | ||
2416 | #ifdef CONFIG_IPW2100_RX_DEBUG | 2416 | #ifdef IPW2100_RX_DEBUG |
2417 | /* Make a copy of the frame so we can dump it to the logs if | 2417 | /* Make a copy of the frame so we can dump it to the logs if |
2418 | * ieee80211_rx fails */ | 2418 | * ieee80211_rx fails */ |
2419 | memcpy(packet_data, packet->skb->data, | 2419 | memcpy(packet_data, packet->skb->data, |
@@ -2421,7 +2421,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i, | |||
2421 | #endif | 2421 | #endif |
2422 | 2422 | ||
2423 | if (!ieee80211_rx(priv->ieee, packet->skb, stats)) { | 2423 | if (!ieee80211_rx(priv->ieee, packet->skb, stats)) { |
2424 | #ifdef CONFIG_IPW2100_RX_DEBUG | 2424 | #ifdef IPW2100_RX_DEBUG |
2425 | IPW_DEBUG_DROP("%s: Non consumed packet:\n", | 2425 | IPW_DEBUG_DROP("%s: Non consumed packet:\n", |
2426 | priv->net_dev->name); | 2426 | priv->net_dev->name); |
2427 | printk_buf(IPW_DL_DROP, packet_data, status->frame_size); | 2427 | 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) | |||
4912 | else | 4912 | else |
4913 | priv->power_mode = IPW_POWER_ENABLED | power_level; | 4913 | priv->power_mode = IPW_POWER_ENABLED | power_level; |
4914 | 4914 | ||
4915 | #ifdef CONFIG_IPW2100_TX_POWER | 4915 | #ifdef IPW2100_TX_POWER |
4916 | if (priv->port_type == IBSS && priv->adhoc_power != DFTL_IBSS_TX_POWER) { | 4916 | if (priv->port_type == IBSS && priv->adhoc_power != DFTL_IBSS_TX_POWER) { |
4917 | /* Set beacon interval */ | 4917 | /* Set beacon interval */ |
4918 | cmd.host_command = TX_POWER_INDEX; | 4918 | cmd.host_command = TX_POWER_INDEX; |