diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_rx.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_rx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 8d9e96f9eb28..794d2fc05813 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c | |||
@@ -1080,7 +1080,7 @@ static int ieee80211_parse_qos_info_param_IE(struct ieee80211_info_element | |||
1080 | return rc; | 1080 | return rc; |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | #ifdef CONFIG_IEEE80211_DEBUG | 1083 | #ifdef CONFIG_LIBIPW_DEBUG |
1084 | #define MFIE_STRING(x) case MFIE_TYPE_ ##x: return #x | 1084 | #define MFIE_STRING(x) case MFIE_TYPE_ ##x: return #x |
1085 | 1085 | ||
1086 | static const char *get_info_element_string(u16 id) | 1086 | static const char *get_info_element_string(u16 id) |
@@ -1125,7 +1125,7 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element | |||
1125 | { | 1125 | { |
1126 | DECLARE_SSID_BUF(ssid); | 1126 | DECLARE_SSID_BUF(ssid); |
1127 | u8 i; | 1127 | u8 i; |
1128 | #ifdef CONFIG_IEEE80211_DEBUG | 1128 | #ifdef CONFIG_LIBIPW_DEBUG |
1129 | char rates_str[64]; | 1129 | char rates_str[64]; |
1130 | char *p; | 1130 | char *p; |
1131 | #endif | 1131 | #endif |
@@ -1161,14 +1161,14 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element | |||
1161 | break; | 1161 | break; |
1162 | 1162 | ||
1163 | case MFIE_TYPE_RATES: | 1163 | case MFIE_TYPE_RATES: |
1164 | #ifdef CONFIG_IEEE80211_DEBUG | 1164 | #ifdef CONFIG_LIBIPW_DEBUG |
1165 | p = rates_str; | 1165 | p = rates_str; |
1166 | #endif | 1166 | #endif |
1167 | network->rates_len = min(info_element->len, | 1167 | network->rates_len = min(info_element->len, |
1168 | MAX_RATES_LENGTH); | 1168 | MAX_RATES_LENGTH); |
1169 | for (i = 0; i < network->rates_len; i++) { | 1169 | for (i = 0; i < network->rates_len; i++) { |
1170 | network->rates[i] = info_element->data[i]; | 1170 | network->rates[i] = info_element->data[i]; |
1171 | #ifdef CONFIG_IEEE80211_DEBUG | 1171 | #ifdef CONFIG_LIBIPW_DEBUG |
1172 | p += snprintf(p, sizeof(rates_str) - | 1172 | p += snprintf(p, sizeof(rates_str) - |
1173 | (p - rates_str), "%02X ", | 1173 | (p - rates_str), "%02X ", |
1174 | network->rates[i]); | 1174 | network->rates[i]); |
@@ -1188,14 +1188,14 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element | |||
1188 | break; | 1188 | break; |
1189 | 1189 | ||
1190 | case MFIE_TYPE_RATES_EX: | 1190 | case MFIE_TYPE_RATES_EX: |
1191 | #ifdef CONFIG_IEEE80211_DEBUG | 1191 | #ifdef CONFIG_LIBIPW_DEBUG |
1192 | p = rates_str; | 1192 | p = rates_str; |
1193 | #endif | 1193 | #endif |
1194 | network->rates_ex_len = min(info_element->len, | 1194 | network->rates_ex_len = min(info_element->len, |
1195 | MAX_RATES_EX_LENGTH); | 1195 | MAX_RATES_EX_LENGTH); |
1196 | for (i = 0; i < network->rates_ex_len; i++) { | 1196 | for (i = 0; i < network->rates_ex_len; i++) { |
1197 | network->rates_ex[i] = info_element->data[i]; | 1197 | network->rates_ex[i] = info_element->data[i]; |
1198 | #ifdef CONFIG_IEEE80211_DEBUG | 1198 | #ifdef CONFIG_LIBIPW_DEBUG |
1199 | p += snprintf(p, sizeof(rates_str) - | 1199 | p += snprintf(p, sizeof(rates_str) - |
1200 | (p - rates_str), "%02X ", | 1200 | (p - rates_str), "%02X ", |
1201 | network->rates[i]); | 1201 | network->rates[i]); |
@@ -1562,7 +1562,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
1562 | }; | 1562 | }; |
1563 | struct ieee80211_network *target; | 1563 | struct ieee80211_network *target; |
1564 | struct ieee80211_network *oldest = NULL; | 1564 | struct ieee80211_network *oldest = NULL; |
1565 | #ifdef CONFIG_IEEE80211_DEBUG | 1565 | #ifdef CONFIG_LIBIPW_DEBUG |
1566 | struct ieee80211_info_element *info_element = beacon->info_element; | 1566 | struct ieee80211_info_element *info_element = beacon->info_element; |
1567 | #endif | 1567 | #endif |
1568 | unsigned long flags; | 1568 | unsigned long flags; |
@@ -1640,7 +1640,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
1640 | list_del(ieee->network_free_list.next); | 1640 | list_del(ieee->network_free_list.next); |
1641 | } | 1641 | } |
1642 | 1642 | ||
1643 | #ifdef CONFIG_IEEE80211_DEBUG | 1643 | #ifdef CONFIG_LIBIPW_DEBUG |
1644 | IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n", | 1644 | IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n", |
1645 | print_ssid(ssid, network.ssid, | 1645 | print_ssid(ssid, network.ssid, |
1646 | network.ssid_len), | 1646 | network.ssid_len), |