diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8192su/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/dot11d.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211.h | 8 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 12 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 44 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/r8192S_phy.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/r8192U_core.c | 22 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/r8192U_wx.c | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/r819xU_phy.c | 4 |
12 files changed, 1 insertions, 113 deletions
diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile index f010ab502a9..d3dde357450 100644 --- a/drivers/staging/rtl8192su/Makefile +++ b/drivers/staging/rtl8192su/Makefile | |||
@@ -7,7 +7,6 @@ EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y | |||
7 | EXTRA_CFLAGS += -DJACKSON_NEW_RX | 7 | EXTRA_CFLAGS += -DJACKSON_NEW_RX |
8 | EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO | 8 | EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO |
9 | #EXTRA_CFLAGS += -DUSE_ONE_PIPE | 9 | #EXTRA_CFLAGS += -DUSE_ONE_PIPE |
10 | EXTRA_CFLAGS += -DENABLE_DOT11D | ||
11 | 10 | ||
12 | EXTRA_CFLAGS += -DRTL8192SU | 11 | EXTRA_CFLAGS += -DRTL8192SU |
13 | EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 | 12 | EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 |
diff --git a/drivers/staging/rtl8192su/ieee80211/Makefile b/drivers/staging/rtl8192su/ieee80211/Makefile index 295a18f3c9c..a500bfaeaef 100644 --- a/drivers/staging/rtl8192su/ieee80211/Makefile +++ b/drivers/staging/rtl8192su/ieee80211/Makefile | |||
@@ -5,8 +5,7 @@ EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 | |||
5 | EXTRA_CFLAGS += -DRTL8192SU | 5 | EXTRA_CFLAGS += -DRTL8192SU |
6 | #EXTRA_CFLAGS += -DJOHN_NOCPY | 6 | #EXTRA_CFLAGS += -DJOHN_NOCPY |
7 | EXTRA_CFLAGS += -DTHOMAS_TURBO | 7 | EXTRA_CFLAGS += -DTHOMAS_TURBO |
8 | #flags to enable or disble 80211D feature | 8 | |
9 | EXTRA_CFLAGS += -DENABLE_DOT11D | ||
10 | ieee80211-rsl-objs := ieee80211_rx.o \ | 9 | ieee80211-rsl-objs := ieee80211_rx.o \ |
11 | ieee80211_softmac.o \ | 10 | ieee80211_softmac.o \ |
12 | ieee80211_tx.o \ | 11 | ieee80211_tx.o \ |
diff --git a/drivers/staging/rtl8192su/ieee80211/dot11d.c b/drivers/staging/rtl8192su/ieee80211/dot11d.c index eebcb7f01c9..a7b6ddcf018 100644 --- a/drivers/staging/rtl8192su/ieee80211/dot11d.c +++ b/drivers/staging/rtl8192su/ieee80211/dot11d.c | |||
@@ -1,4 +1,3 @@ | |||
1 | #ifdef ENABLE_DOT11D | ||
2 | //----------------------------------------------------------------------------- | 1 | //----------------------------------------------------------------------------- |
3 | // File: | 2 | // File: |
4 | // Dot11d.c | 3 | // Dot11d.c |
@@ -227,4 +226,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete); | |||
227 | EXPORT_SYMBOL(IsLegalChannel); | 226 | EXPORT_SYMBOL(IsLegalChannel); |
228 | EXPORT_SYMBOL(ToLegalChannel); | 227 | EXPORT_SYMBOL(ToLegalChannel); |
229 | 228 | ||
230 | #endif | ||
diff --git a/drivers/staging/rtl8192su/ieee80211/dot11d.h b/drivers/staging/rtl8192su/ieee80211/dot11d.h index 15b7a4ba37b..913ac5d97e7 100644 --- a/drivers/staging/rtl8192su/ieee80211/dot11d.h +++ b/drivers/staging/rtl8192su/ieee80211/dot11d.h | |||
@@ -1,11 +1,8 @@ | |||
1 | #ifndef __INC_DOT11D_H | 1 | #ifndef __INC_DOT11D_H |
2 | #define __INC_DOT11D_H | 2 | #define __INC_DOT11D_H |
3 | 3 | ||
4 | #ifdef ENABLE_DOT11D | ||
5 | #include "ieee80211.h" | 4 | #include "ieee80211.h" |
6 | 5 | ||
7 | //#define ENABLE_DOT11D | ||
8 | |||
9 | //#define DOT11D_MAX_CHNL_NUM 83 | 6 | //#define DOT11D_MAX_CHNL_NUM 83 |
10 | 7 | ||
11 | typedef struct _CHNL_TXPOWER_TRIPLE { | 8 | typedef struct _CHNL_TXPOWER_TRIPLE { |
@@ -98,5 +95,4 @@ int ToLegalChannel( | |||
98 | struct ieee80211_device * dev, | 95 | struct ieee80211_device * dev, |
99 | u8 channel | 96 | u8 channel |
100 | ); | 97 | ); |
101 | #endif //ENABLE_DOT11D | ||
102 | #endif // #ifndef __INC_DOT11D_H | 98 | #endif // #ifndef __INC_DOT11D_H |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211.h b/drivers/staging/rtl8192su/ieee80211/ieee80211.h index 707175a3d4b..8dff4100b89 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211.h | |||
@@ -1446,10 +1446,8 @@ struct ieee80211_network { | |||
1446 | #ifdef THOMAS_TURBO | 1446 | #ifdef THOMAS_TURBO |
1447 | u8 Turbo_Enable;//enable turbo mode, added by thomas | 1447 | u8 Turbo_Enable;//enable turbo mode, added by thomas |
1448 | #endif | 1448 | #endif |
1449 | #ifdef ENABLE_DOT11D | ||
1450 | u16 CountryIeLen; | 1449 | u16 CountryIeLen; |
1451 | u8 CountryIeBuf[MAX_IE_LEN]; | 1450 | u8 CountryIeBuf[MAX_IE_LEN]; |
1452 | #endif | ||
1453 | // HT Related, by amy, 2008.04.29 | 1451 | // HT Related, by amy, 2008.04.29 |
1454 | BSS_HT bssht; | 1452 | BSS_HT bssht; |
1455 | // Add to handle broadcom AP management frame CCK rate. | 1453 | // Add to handle broadcom AP management frame CCK rate. |
@@ -1674,7 +1672,6 @@ typedef u32 RT_RF_CHANGE_SOURCE; | |||
1674 | #define RF_CHANGE_BY_IPS BIT28 | 1672 | #define RF_CHANGE_BY_IPS BIT28 |
1675 | #define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. | 1673 | #define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. |
1676 | 1674 | ||
1677 | #ifdef ENABLE_DOT11D | ||
1678 | typedef enum | 1675 | typedef enum |
1679 | { | 1676 | { |
1680 | COUNTRY_CODE_FCC = 0, | 1677 | COUNTRY_CODE_FCC = 0, |
@@ -1689,7 +1686,6 @@ typedef enum | |||
1689 | COUNTRY_CODE_MIC, | 1686 | COUNTRY_CODE_MIC, |
1690 | COUNTRY_CODE_GLOBAL_DOMAIN | 1687 | COUNTRY_CODE_GLOBAL_DOMAIN |
1691 | }country_code_type_t; | 1688 | }country_code_type_t; |
1692 | #endif | ||
1693 | // Firmware realted CMD IO. | 1689 | // Firmware realted CMD IO. |
1694 | typedef enum _FW_CMD_IO_TYPE{ | 1690 | typedef enum _FW_CMD_IO_TYPE{ |
1695 | FW_CMD_DIG_ENABLE = 0, // For DIG DM | 1691 | FW_CMD_DIG_ENABLE = 0, // For DIG DM |
@@ -1898,12 +1894,8 @@ struct ieee80211_device { | |||
1898 | 1894 | ||
1899 | /* map of allowed channels. 0 is dummy */ | 1895 | /* map of allowed channels. 0 is dummy */ |
1900 | // FIXME: remeber to default to a basic channel plan depending of the PHY type | 1896 | // FIXME: remeber to default to a basic channel plan depending of the PHY type |
1901 | #ifdef ENABLE_DOT11D | ||
1902 | void* pDot11dInfo; | 1897 | void* pDot11dInfo; |
1903 | bool bGlobalDomain; | 1898 | bool bGlobalDomain; |
1904 | #else | ||
1905 | int channel_map[MAX_CHANNEL_NUMBER+1]; | ||
1906 | #endif | ||
1907 | int rate; /* current rate */ | 1899 | int rate; /* current rate */ |
1908 | int basic_rate; | 1900 | int basic_rate; |
1909 | //FIXME: pleace callback, see if redundant with softmac_features | 1901 | //FIXME: pleace callback, see if redundant with softmac_features |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c index 27f56389b6a..c175aa43d37 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | |||
@@ -44,9 +44,7 @@ | |||
44 | #include <linux/ctype.h> | 44 | #include <linux/ctype.h> |
45 | 45 | ||
46 | #include "ieee80211.h" | 46 | #include "ieee80211.h" |
47 | #ifdef ENABLE_DOT11D | ||
48 | #include "dot11d.h" | 47 | #include "dot11d.h" |
49 | #endif | ||
50 | static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee, | 48 | static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee, |
51 | struct sk_buff *skb, | 49 | struct sk_buff *skb, |
52 | struct ieee80211_rx_stats *rx_stats) | 50 | struct ieee80211_rx_stats *rx_stats) |
@@ -1652,7 +1650,6 @@ static const char *get_info_element_string(u16 id) | |||
1652 | } | 1650 | } |
1653 | #endif | 1651 | #endif |
1654 | 1652 | ||
1655 | #ifdef ENABLE_DOT11D | ||
1656 | static inline void ieee80211_extract_country_ie( | 1653 | static inline void ieee80211_extract_country_ie( |
1657 | struct ieee80211_device *ieee, | 1654 | struct ieee80211_device *ieee, |
1658 | struct ieee80211_info_element *info_element, | 1655 | struct ieee80211_info_element *info_element, |
@@ -1685,7 +1682,6 @@ static inline void ieee80211_extract_country_ie( | |||
1685 | } | 1682 | } |
1686 | 1683 | ||
1687 | } | 1684 | } |
1688 | #endif | ||
1689 | 1685 | ||
1690 | int ieee80211_parse_info_param(struct ieee80211_device *ieee, | 1686 | int ieee80211_parse_info_param(struct ieee80211_device *ieee, |
1691 | struct ieee80211_info_element *info_element, | 1687 | struct ieee80211_info_element *info_element, |
@@ -2176,14 +2172,12 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, | |||
2176 | "QoS Error need to parse QOS_PARAMETER IE\n"); | 2172 | "QoS Error need to parse QOS_PARAMETER IE\n"); |
2177 | break; | 2173 | break; |
2178 | 2174 | ||
2179 | #ifdef ENABLE_DOT11D | ||
2180 | case MFIE_TYPE_COUNTRY: | 2175 | case MFIE_TYPE_COUNTRY: |
2181 | IEEE80211_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n", | 2176 | IEEE80211_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n", |
2182 | info_element->len); | 2177 | info_element->len); |
2183 | //printk("=====>Receive <%s> Country IE\n",network->ssid); | 2178 | //printk("=====>Receive <%s> Country IE\n",network->ssid); |
2184 | ieee80211_extract_country_ie(ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP | 2179 | ieee80211_extract_country_ie(ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP |
2185 | break; | 2180 | break; |
2186 | #endif | ||
2187 | /* TODO */ | 2181 | /* TODO */ |
2188 | #if 0 | 2182 | #if 0 |
2189 | /* 802.11h */ | 2183 | /* 802.11h */ |
@@ -2359,10 +2353,8 @@ static inline int ieee80211_network_init( | |||
2359 | #ifdef THOMAS_TURBO | 2353 | #ifdef THOMAS_TURBO |
2360 | network->Turbo_Enable = 0; | 2354 | network->Turbo_Enable = 0; |
2361 | #endif | 2355 | #endif |
2362 | #ifdef ENABLE_DOT11D | ||
2363 | network->CountryIeLen = 0; | 2356 | network->CountryIeLen = 0; |
2364 | memset(network->CountryIeBuf, 0, MAX_IE_LEN); | 2357 | memset(network->CountryIeBuf, 0, MAX_IE_LEN); |
2365 | #endif | ||
2366 | //Initialize HT parameters | 2358 | //Initialize HT parameters |
2367 | //ieee80211_ht_initialize(&network->bssht); | 2359 | //ieee80211_ht_initialize(&network->bssht); |
2368 | HTInitializeBssDesc(&network->bssht); | 2360 | HTInitializeBssDesc(&network->bssht); |
@@ -2540,10 +2532,8 @@ static inline void update_network(struct ieee80211_network *dst, | |||
2540 | dst->Turbo_Enable = src->Turbo_Enable; | 2532 | dst->Turbo_Enable = src->Turbo_Enable; |
2541 | #endif | 2533 | #endif |
2542 | 2534 | ||
2543 | #ifdef ENABLE_DOT11D | ||
2544 | dst->CountryIeLen = src->CountryIeLen; | 2535 | dst->CountryIeLen = src->CountryIeLen; |
2545 | memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); | 2536 | memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); |
2546 | #endif | ||
2547 | 2537 | ||
2548 | //added by amy for LEAP | 2538 | //added by amy for LEAP |
2549 | dst->bWithAironetIE = src->bWithAironetIE; | 2539 | dst->bWithAironetIE = src->bWithAironetIE; |
@@ -2611,7 +2601,6 @@ static inline void ieee80211_process_probe_response( | |||
2611 | return; | 2601 | return; |
2612 | } | 2602 | } |
2613 | 2603 | ||
2614 | #ifdef ENABLE_DOT11D | ||
2615 | // For Asus EeePc request, | 2604 | // For Asus EeePc request, |
2616 | // (1) if wireless adapter receive get any 802.11d country code in AP beacon, | 2605 | // (1) if wireless adapter receive get any 802.11d country code in AP beacon, |
2617 | // wireless adapter should follow the country code. | 2606 | // wireless adapter should follow the country code. |
@@ -2668,7 +2657,6 @@ static inline void ieee80211_process_probe_response( | |||
2668 | } | 2657 | } |
2669 | } | 2658 | } |
2670 | } | 2659 | } |
2671 | #endif | ||
2672 | 2660 | ||
2673 | /* The network parsed correctly -- so now we scan our known networks | 2661 | /* The network parsed correctly -- so now we scan our known networks |
2674 | * to see if we can find it in our list. | 2662 | * to see if we can find it in our list. |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c index d02fd56563c..4d091b1a91c 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | |||
@@ -20,9 +20,7 @@ | |||
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/version.h> | 21 | #include <linux/version.h> |
22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
23 | #ifdef ENABLE_DOT11D | ||
24 | #include "dot11d.h" | 23 | #include "dot11d.h" |
25 | #endif | ||
26 | 24 | ||
27 | u8 rsn_authen_cipher_suite[16][4] = { | 25 | u8 rsn_authen_cipher_suite[16][4] = { |
28 | {0x00,0x0F,0xAC,0x00}, //Use group key, //Reserved | 26 | {0x00,0x0F,0xAC,0x00}, //Use group key, //Reserved |
@@ -435,10 +433,8 @@ void ieee80211_send_probe_requests(struct ieee80211_device *ieee) | |||
435 | void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) | 433 | void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) |
436 | { | 434 | { |
437 | short ch = 0; | 435 | short ch = 0; |
438 | #ifdef ENABLE_DOT11D | ||
439 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; | 436 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; |
440 | memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); | 437 | memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); |
441 | #endif | ||
442 | ieee->be_scan_inprogress = true; | 438 | ieee->be_scan_inprogress = true; |
443 | down(&ieee->scan_sem); | 439 | down(&ieee->scan_sem); |
444 | 440 | ||
@@ -449,11 +445,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) | |||
449 | ch++; | 445 | ch++; |
450 | if (ch > MAX_CHANNEL_NUMBER) | 446 | if (ch > MAX_CHANNEL_NUMBER) |
451 | goto out; /* scan completed */ | 447 | goto out; /* scan completed */ |
452 | #ifdef ENABLE_DOT11D | ||
453 | }while(!channel_map[ch]); | 448 | }while(!channel_map[ch]); |
454 | #else | ||
455 | }while(!ieee->channel_map[ch]); | ||
456 | #endif | ||
457 | 449 | ||
458 | /* this fuction can be called in two situations | 450 | /* this fuction can be called in two situations |
459 | * 1- We have switched to ad-hoc mode and we are | 451 | * 1- We have switched to ad-hoc mode and we are |
@@ -477,9 +469,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) | |||
477 | if (ieee->state == IEEE80211_LINKED) | 469 | if (ieee->state == IEEE80211_LINKED) |
478 | goto out; | 470 | goto out; |
479 | ieee->set_chan(ieee->dev, ch); | 471 | ieee->set_chan(ieee->dev, ch); |
480 | #ifdef ENABLE_DOT11D | ||
481 | if(channel_map[ch] == 1) | 472 | if(channel_map[ch] == 1) |
482 | #endif | ||
483 | ieee80211_send_probe_requests(ieee); | 473 | ieee80211_send_probe_requests(ieee); |
484 | 474 | ||
485 | /* this prevent excessive time wait when we | 475 | /* this prevent excessive time wait when we |
@@ -503,10 +493,8 @@ out: | |||
503 | } | 493 | } |
504 | else{ | 494 | else{ |
505 | ieee->sync_scan_hurryup = 0; | 495 | ieee->sync_scan_hurryup = 0; |
506 | #ifdef ENABLE_DOT11D | ||
507 | if(IS_DOT11D_ENABLE(ieee)) | 496 | if(IS_DOT11D_ENABLE(ieee)) |
508 | DOT11D_ScanComplete(ieee); | 497 | DOT11D_ScanComplete(ieee); |
509 | #endif | ||
510 | up(&ieee->scan_sem); | 498 | up(&ieee->scan_sem); |
511 | ieee->be_scan_inprogress = false; | 499 | ieee->be_scan_inprogress = false; |
512 | } | 500 | } |
@@ -517,10 +505,8 @@ void ieee80211_softmac_scan_wq(struct work_struct *work) | |||
517 | struct delayed_work *dwork = container_of(work, struct delayed_work, work); | 505 | struct delayed_work *dwork = container_of(work, struct delayed_work, work); |
518 | struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq); | 506 | struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq); |
519 | u8 last_channel = ieee->current_network.channel; //recored init channel inorder not change current channel when comming out the scan unexpectedly. WB. | 507 | u8 last_channel = ieee->current_network.channel; //recored init channel inorder not change current channel when comming out the scan unexpectedly. WB. |
520 | #ifdef ENABLE_DOT11D | ||
521 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; | 508 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; |
522 | memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); | 509 | memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); |
523 | #endif | ||
524 | if(!ieee->ieee_up) | 510 | if(!ieee->ieee_up) |
525 | return; | 511 | return; |
526 | down(&ieee->scan_sem); | 512 | down(&ieee->scan_sem); |
@@ -530,25 +516,15 @@ void ieee80211_softmac_scan_wq(struct work_struct *work) | |||
530 | if (ieee->scan_watch_dog++ > MAX_CHANNEL_NUMBER) | 516 | if (ieee->scan_watch_dog++ > MAX_CHANNEL_NUMBER) |
531 | { | 517 | { |
532 | //if current channel is not in channel map, set to default channel. | 518 | //if current channel is not in channel map, set to default channel. |
533 | #ifdef ENABLE_DOT11D | ||
534 | if (!channel_map[ieee->current_network.channel]); | 519 | if (!channel_map[ieee->current_network.channel]); |
535 | #else | ||
536 | if (!ieee->channel_map[ieee->current_network.channel]); | ||
537 | #endif | ||
538 | ieee->current_network.channel = 6; | 520 | ieee->current_network.channel = 6; |
539 | goto out; /* no good chans */ | 521 | goto out; /* no good chans */ |
540 | } | 522 | } |
541 | #ifdef ENABLE_DOT11D | ||
542 | }while(!channel_map[ieee->current_network.channel]); | 523 | }while(!channel_map[ieee->current_network.channel]); |
543 | #else | ||
544 | }while(!ieee->channel_map[ieee->current_network.channel]); | ||
545 | #endif | ||
546 | if (ieee->scanning == 0 ) | 524 | if (ieee->scanning == 0 ) |
547 | goto out; | 525 | goto out; |
548 | ieee->set_chan(ieee->dev, ieee->current_network.channel); | 526 | ieee->set_chan(ieee->dev, ieee->current_network.channel); |
549 | #ifdef ENABLE_DOT11D | ||
550 | if(channel_map[ieee->current_network.channel] == 1) | 527 | if(channel_map[ieee->current_network.channel] == 1) |
551 | #endif | ||
552 | ieee80211_send_probe_requests(ieee); | 528 | ieee80211_send_probe_requests(ieee); |
553 | 529 | ||
554 | queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME); | 530 | queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME); |
@@ -556,10 +532,8 @@ void ieee80211_softmac_scan_wq(struct work_struct *work) | |||
556 | up(&ieee->scan_sem); | 532 | up(&ieee->scan_sem); |
557 | return; | 533 | return; |
558 | out: | 534 | out: |
559 | #ifdef ENABLE_DOT11D | ||
560 | if(IS_DOT11D_ENABLE(ieee)) | 535 | if(IS_DOT11D_ENABLE(ieee)) |
561 | DOT11D_ScanComplete(ieee); | 536 | DOT11D_ScanComplete(ieee); |
562 | #endif | ||
563 | ieee->current_network.channel = last_channel; | 537 | ieee->current_network.channel = last_channel; |
564 | ieee->actscanning = false; | 538 | ieee->actscanning = false; |
565 | ieee->scan_watch_dog = 0; | 539 | ieee->scan_watch_dog = 0; |
@@ -640,7 +614,6 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee) | |||
640 | /* called with ieee->lock held */ | 614 | /* called with ieee->lock held */ |
641 | void ieee80211_start_scan(struct ieee80211_device *ieee) | 615 | void ieee80211_start_scan(struct ieee80211_device *ieee) |
642 | { | 616 | { |
643 | #ifdef ENABLE_DOT11D | ||
644 | if(IS_DOT11D_ENABLE(ieee) ) | 617 | if(IS_DOT11D_ENABLE(ieee) ) |
645 | { | 618 | { |
646 | if(IS_COUNTRY_IE_VALID(ieee)) | 619 | if(IS_COUNTRY_IE_VALID(ieee)) |
@@ -648,7 +621,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee) | |||
648 | RESET_CIE_WATCHDOG(ieee); | 621 | RESET_CIE_WATCHDOG(ieee); |
649 | } | 622 | } |
650 | } | 623 | } |
651 | #endif | ||
652 | if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){ | 624 | if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){ |
653 | if (ieee->scanning == 0){ | 625 | if (ieee->scanning == 0){ |
654 | ieee->scanning = 1; | 626 | ieee->scanning = 1; |
@@ -662,7 +634,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee) | |||
662 | /* called with wx_sem held */ | 634 | /* called with wx_sem held */ |
663 | void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) | 635 | void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) |
664 | { | 636 | { |
665 | #ifdef ENABLE_DOT11D | ||
666 | if(IS_DOT11D_ENABLE(ieee) ) | 637 | if(IS_DOT11D_ENABLE(ieee) ) |
667 | { | 638 | { |
668 | if(IS_COUNTRY_IE_VALID(ieee)) | 639 | if(IS_COUNTRY_IE_VALID(ieee)) |
@@ -670,7 +641,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) | |||
670 | RESET_CIE_WATCHDOG(ieee); | 641 | RESET_CIE_WATCHDOG(ieee); |
671 | } | 642 | } |
672 | } | 643 | } |
673 | #endif | ||
674 | ieee->sync_scan_hurryup = 0; | 644 | ieee->sync_scan_hurryup = 0; |
675 | if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) | 645 | if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) |
676 | ieee80211_softmac_scan_syncro(ieee); | 646 | ieee80211_softmac_scan_syncro(ieee); |
@@ -2499,11 +2469,9 @@ void ieee80211_start_ibss_wq(struct work_struct *work) | |||
2499 | ieee80211_softmac_check_all_nets(ieee); | 2469 | ieee80211_softmac_check_all_nets(ieee); |
2500 | 2470 | ||
2501 | 2471 | ||
2502 | #ifdef ENABLE_DOT11D //if creating an ad-hoc, set its channel to 10 temporarily--this is the requirement for ASUS, not 11D, so disable 11d. | ||
2503 | // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) | 2472 | // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) |
2504 | if (ieee->state == IEEE80211_NOLINK) | 2473 | if (ieee->state == IEEE80211_NOLINK) |
2505 | ieee->current_network.channel = 6; | 2474 | ieee->current_network.channel = 6; |
2506 | #endif | ||
2507 | /* if not then the state is not linked. Maybe the user swithced to | 2475 | /* if not then the state is not linked. Maybe the user swithced to |
2508 | * ad-hoc mode just after being in monitor mode, or just after | 2476 | * ad-hoc mode just after being in monitor mode, or just after |
2509 | * being very few time in managed mode (so the card have had no | 2477 | * being very few time in managed mode (so the card have had no |
@@ -2593,7 +2561,6 @@ inline void ieee80211_start_ibss(struct ieee80211_device *ieee) | |||
2593 | void ieee80211_start_bss(struct ieee80211_device *ieee) | 2561 | void ieee80211_start_bss(struct ieee80211_device *ieee) |
2594 | { | 2562 | { |
2595 | unsigned long flags; | 2563 | unsigned long flags; |
2596 | #ifdef ENABLE_DOT11D | ||
2597 | // | 2564 | // |
2598 | // Ref: 802.11d 11.1.3.3 | 2565 | // Ref: 802.11d 11.1.3.3 |
2599 | // STA shall not start a BSS unless properly formed Beacon frame including a Country IE. | 2566 | // STA shall not start a BSS unless properly formed Beacon frame including a Country IE. |
@@ -2605,7 +2572,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee) | |||
2605 | return; | 2572 | return; |
2606 | } | 2573 | } |
2607 | } | 2574 | } |
2608 | #endif | ||
2609 | /* check if we have already found the net we | 2575 | /* check if we have already found the net we |
2610 | * are interested in (if any). | 2576 | * are interested in (if any). |
2611 | * if not (we are disassociated and we are not | 2577 | * if not (we are disassociated and we are not |
@@ -2647,10 +2613,8 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) | |||
2647 | 2613 | ||
2648 | if (ieee->data_hard_stop) | 2614 | if (ieee->data_hard_stop) |
2649 | ieee->data_hard_stop(ieee->dev); | 2615 | ieee->data_hard_stop(ieee->dev); |
2650 | #ifdef ENABLE_DOT11D | ||
2651 | if(IS_DOT11D_ENABLE(ieee)) | 2616 | if(IS_DOT11D_ENABLE(ieee)) |
2652 | Dot11d_Reset(ieee); | 2617 | Dot11d_Reset(ieee); |
2653 | #endif | ||
2654 | ieee->state = IEEE80211_NOLINK; | 2618 | ieee->state = IEEE80211_NOLINK; |
2655 | ieee->is_set_key = false; | 2619 | ieee->is_set_key = false; |
2656 | 2620 | ||
@@ -2796,11 +2760,7 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) | |||
2796 | ch++; | 2760 | ch++; |
2797 | if (ch > MAX_CHANNEL_NUMBER) | 2761 | if (ch > MAX_CHANNEL_NUMBER) |
2798 | return; /* no channel found */ | 2762 | return; /* no channel found */ |
2799 | #ifdef ENABLE_DOT11D | ||
2800 | }while(!GET_DOT11D_INFO(ieee)->channel_map[ch]); | 2763 | }while(!GET_DOT11D_INFO(ieee)->channel_map[ch]); |
2801 | #else | ||
2802 | }while(!ieee->channel_map[ch]); | ||
2803 | #endif | ||
2804 | ieee->current_network.channel = ch; | 2764 | ieee->current_network.channel = ch; |
2805 | } | 2765 | } |
2806 | 2766 | ||
@@ -2848,12 +2808,10 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) | |||
2848 | for(i = 0; i < 5; i++) { | 2808 | for(i = 0; i < 5; i++) { |
2849 | ieee->seq_ctrl[i] = 0; | 2809 | ieee->seq_ctrl[i] = 0; |
2850 | } | 2810 | } |
2851 | #ifdef ENABLE_DOT11D | ||
2852 | ieee->pDot11dInfo = kmalloc(sizeof(RT_DOT11D_INFO), GFP_ATOMIC); | 2811 | ieee->pDot11dInfo = kmalloc(sizeof(RT_DOT11D_INFO), GFP_ATOMIC); |
2853 | if (!ieee->pDot11dInfo) | 2812 | if (!ieee->pDot11dInfo) |
2854 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for DOT11D\n"); | 2813 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for DOT11D\n"); |
2855 | memset(ieee->pDot11dInfo, 0, sizeof(RT_DOT11D_INFO)); | 2814 | memset(ieee->pDot11dInfo, 0, sizeof(RT_DOT11D_INFO)); |
2856 | #endif | ||
2857 | //added for AP roaming | 2815 | //added for AP roaming |
2858 | ieee->LinkDetectInfo.SlotNum = 2; | 2816 | ieee->LinkDetectInfo.SlotNum = 2; |
2859 | ieee->LinkDetectInfo.NumRecvBcnInPeriod=0; | 2817 | ieee->LinkDetectInfo.NumRecvBcnInPeriod=0; |
@@ -2924,13 +2882,11 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) | |||
2924 | void ieee80211_softmac_free(struct ieee80211_device *ieee) | 2882 | void ieee80211_softmac_free(struct ieee80211_device *ieee) |
2925 | { | 2883 | { |
2926 | down(&ieee->wx_sem); | 2884 | down(&ieee->wx_sem); |
2927 | #ifdef ENABLE_DOT11D | ||
2928 | if(NULL != ieee->pDot11dInfo) | 2885 | if(NULL != ieee->pDot11dInfo) |
2929 | { | 2886 | { |
2930 | kfree(ieee->pDot11dInfo); | 2887 | kfree(ieee->pDot11dInfo); |
2931 | ieee->pDot11dInfo = NULL; | 2888 | ieee->pDot11dInfo = NULL; |
2932 | } | 2889 | } |
2933 | #endif | ||
2934 | del_timer_sync(&ieee->associate_timer); | 2890 | del_timer_sync(&ieee->associate_timer); |
2935 | 2891 | ||
2936 | cancel_delayed_work(&ieee->associate_retry_wq); | 2892 | cancel_delayed_work(&ieee->associate_retry_wq); |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c index 0f668d1c1bb..9e7f9577422 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c | |||
@@ -15,9 +15,7 @@ | |||
15 | 15 | ||
16 | 16 | ||
17 | #include "ieee80211.h" | 17 | #include "ieee80211.h" |
18 | #ifdef ENABLE_DOT11D | ||
19 | #include "dot11d.h" | 18 | #include "dot11d.h" |
20 | #endif | ||
21 | /* FIXME: add A freqs */ | 19 | /* FIXME: add A freqs */ |
22 | 20 | ||
23 | const long ieee80211_wlan_frequencies[] = { | 21 | const long ieee80211_wlan_frequencies[] = { |
@@ -63,12 +61,10 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info | |||
63 | 61 | ||
64 | }else { /* Set the channel */ | 62 | }else { /* Set the channel */ |
65 | 63 | ||
66 | #ifdef ENABLE_DOT11D | ||
67 | if (!(GET_DOT11D_INFO(ieee)->channel_map)[fwrq->m]) { | 64 | if (!(GET_DOT11D_INFO(ieee)->channel_map)[fwrq->m]) { |
68 | ret = -EINVAL; | 65 | ret = -EINVAL; |
69 | goto out; | 66 | goto out; |
70 | } | 67 | } |
71 | #endif | ||
72 | ieee->current_network.channel = fwrq->m; | 68 | ieee->current_network.channel = fwrq->m; |
73 | ieee->set_chan(ieee->dev, ieee->current_network.channel); | 69 | ieee->set_chan(ieee->dev, ieee->current_network.channel); |
74 | 70 | ||
diff --git a/drivers/staging/rtl8192su/r8192S_phy.c b/drivers/staging/rtl8192su/r8192S_phy.c index 5e922cb50c2..e2c9ed20287 100644 --- a/drivers/staging/rtl8192su/r8192S_phy.c +++ b/drivers/staging/rtl8192su/r8192S_phy.c | |||
@@ -47,9 +47,7 @@ | |||
47 | #include "r819xU_phyreg.h" | 47 | #include "r819xU_phyreg.h" |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #ifdef ENABLE_DOT11D | ||
51 | #include "ieee80211/dot11d.h" | 50 | #include "ieee80211/dot11d.h" |
52 | #endif | ||
53 | 51 | ||
54 | /*---------------------------Define Local Constant---------------------------*/ | 52 | /*---------------------------Define Local Constant---------------------------*/ |
55 | /* Channel switch:The size of command tables for switch channel*/ | 53 | /* Channel switch:The size of command tables for switch channel*/ |
@@ -3691,13 +3689,11 @@ phy_SwChnlStepByStep( | |||
3691 | //RT_ASSERT(IsLegalChannel(dev, channel), ("illegal channel: %d\n", channel)); | 3689 | //RT_ASSERT(IsLegalChannel(dev, channel), ("illegal channel: %d\n", channel)); |
3692 | RT_TRACE(COMP_CH, "===========>%s(), channel:%d, stage:%d, step:%d\n", __FUNCTION__, channel, *stage, *step); | 3690 | RT_TRACE(COMP_CH, "===========>%s(), channel:%d, stage:%d, step:%d\n", __FUNCTION__, channel, *stage, *step); |
3693 | //RT_ASSERT((pHalData != NULL), ("pHalData should not be NULL\n")); | 3691 | //RT_ASSERT((pHalData != NULL), ("pHalData should not be NULL\n")); |
3694 | #ifdef ENABLE_DOT11D | ||
3695 | if (!IsLegalChannel(priv->ieee80211, channel)) | 3692 | if (!IsLegalChannel(priv->ieee80211, channel)) |
3696 | { | 3693 | { |
3697 | RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel); | 3694 | RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel); |
3698 | return true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop. | 3695 | return true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop. |
3699 | } | 3696 | } |
3700 | #endif | ||
3701 | 3697 | ||
3702 | //pChnlAccessSetting = &Adapter->MgntInfo.Info8185.ChannelAccessSetting; | 3698 | //pChnlAccessSetting = &Adapter->MgntInfo.Info8185.ChannelAccessSetting; |
3703 | //RT_ASSERT((pChnlAccessSetting != NULL), ("pChnlAccessSetting should not be NULL\n")); | 3699 | //RT_ASSERT((pChnlAccessSetting != NULL), ("pChnlAccessSetting should not be NULL\n")); |
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 504965a19b5..62f51457133 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c | |||
@@ -80,9 +80,7 @@ double __extendsfdf2(float a) {return a;} | |||
80 | #include "r8192U_pm.h" | 80 | #include "r8192U_pm.h" |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #ifdef ENABLE_DOT11D | ||
84 | #include "ieee80211/dot11d.h" | 83 | #include "ieee80211/dot11d.h" |
85 | #endif | ||
86 | 84 | ||
87 | #else | 85 | #else |
88 | 86 | ||
@@ -103,9 +101,7 @@ double __extendsfdf2(float a) {return a;} | |||
103 | #include "r8192U_pm.h" | 101 | #include "r8192U_pm.h" |
104 | #endif | 102 | #endif |
105 | 103 | ||
106 | #ifdef ENABLE_DOT11D | ||
107 | #include "ieee80211/dot11d.h" | 104 | #include "ieee80211/dot11d.h" |
108 | #endif | ||
109 | 105 | ||
110 | #endif | 106 | #endif |
111 | 107 | ||
@@ -286,7 +282,6 @@ struct rtl819x_ops rtl8192u_ops = { | |||
286 | }; | 282 | }; |
287 | #endif | 283 | #endif |
288 | 284 | ||
289 | #ifdef ENABLE_DOT11D | ||
290 | 285 | ||
291 | typedef struct _CHANNEL_LIST | 286 | typedef struct _CHANNEL_LIST |
292 | { | 287 | { |
@@ -362,7 +357,6 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv) | |||
362 | } | 357 | } |
363 | return; | 358 | return; |
364 | } | 359 | } |
365 | #endif | ||
366 | 360 | ||
367 | #define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 ) | 361 | #define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 ) |
368 | 362 | ||
@@ -6850,7 +6844,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) | |||
6850 | short rtl8192_get_channel_map(struct net_device * dev) | 6844 | short rtl8192_get_channel_map(struct net_device * dev) |
6851 | { | 6845 | { |
6852 | struct r8192_priv *priv = ieee80211_priv(dev); | 6846 | struct r8192_priv *priv = ieee80211_priv(dev); |
6853 | #ifdef ENABLE_DOT11D | ||
6854 | if(priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){ | 6847 | if(priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){ |
6855 | printk("rtl8180_init:Error channel plan! Set to default.\n"); | 6848 | printk("rtl8180_init:Error channel plan! Set to default.\n"); |
6856 | priv->ChannelPlan= 0; | 6849 | priv->ChannelPlan= 0; |
@@ -6858,21 +6851,6 @@ short rtl8192_get_channel_map(struct net_device * dev) | |||
6858 | RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan); | 6851 | RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan); |
6859 | 6852 | ||
6860 | rtl819x_set_channel_map(priv->ChannelPlan, priv); | 6853 | rtl819x_set_channel_map(priv->ChannelPlan, priv); |
6861 | #else | ||
6862 | int ch,i; | ||
6863 | //Set Default Channel Plan | ||
6864 | if(!channels){ | ||
6865 | DMESG("No channels, aborting"); | ||
6866 | return -1; | ||
6867 | } | ||
6868 | ch=channels; | ||
6869 | priv->ChannelPlan= 0;//hikaru | ||
6870 | // set channels 1..14 allowed in given locale | ||
6871 | for (i=1; i<=14; i++) { | ||
6872 | (priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01); | ||
6873 | ch >>= 1; | ||
6874 | } | ||
6875 | #endif | ||
6876 | return 0; | 6854 | return 0; |
6877 | } | 6855 | } |
6878 | 6856 | ||
diff --git a/drivers/staging/rtl8192su/r8192U_wx.c b/drivers/staging/rtl8192su/r8192U_wx.c index 74aa9628265..8b566416d80 100644 --- a/drivers/staging/rtl8192su/r8192U_wx.c +++ b/drivers/staging/rtl8192su/r8192U_wx.c | |||
@@ -27,9 +27,7 @@ | |||
27 | #include "r8192U_hw.h" | 27 | #include "r8192U_hw.h" |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #ifdef ENABLE_DOT11D | ||
31 | #include "ieee80211/dot11d.h" | 30 | #include "ieee80211/dot11d.h" |
32 | #endif | ||
33 | 31 | ||
34 | #define RATE_COUNT 12 | 32 | #define RATE_COUNT 12 |
35 | u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000, | 33 | u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000, |
@@ -529,11 +527,7 @@ static int rtl8180_wx_get_range(struct net_device *dev, | |||
529 | for (i = 0, val = 0; i < 14; i++) { | 527 | for (i = 0, val = 0; i < 14; i++) { |
530 | 528 | ||
531 | // Include only legal frequencies for some countries | 529 | // Include only legal frequencies for some countries |
532 | #ifdef ENABLE_DOT11D | ||
533 | if ((GET_DOT11D_INFO(priv->ieee80211)->channel_map)[i+1]) { | 530 | if ((GET_DOT11D_INFO(priv->ieee80211)->channel_map)[i+1]) { |
534 | #else | ||
535 | if ((priv->ieee80211->channel_map)[i+1]) { | ||
536 | #endif | ||
537 | range->freq[val].i = i + 1; | 531 | range->freq[val].i = i + 1; |
538 | range->freq[val].m = ieee80211_wlan_frequencies[i] * 100000; | 532 | range->freq[val].m = ieee80211_wlan_frequencies[i] * 100000; |
539 | range->freq[val].e = 1; | 533 | range->freq[val].e = 1; |
diff --git a/drivers/staging/rtl8192su/r819xU_phy.c b/drivers/staging/rtl8192su/r819xU_phy.c index f8f7de8dd85..0cc2785123d 100644 --- a/drivers/staging/rtl8192su/r819xU_phy.c +++ b/drivers/staging/rtl8192su/r819xU_phy.c | |||
@@ -6,9 +6,7 @@ | |||
6 | #include "r8192U_dm.h" | 6 | #include "r8192U_dm.h" |
7 | #include "r819xU_firmware_img.h" | 7 | #include "r819xU_firmware_img.h" |
8 | 8 | ||
9 | #ifdef ENABLE_DOT11D | ||
10 | #include "ieee80211/dot11d.h" | 9 | #include "ieee80211/dot11d.h" |
11 | #endif | ||
12 | static u32 RF_CHANNEL_TABLE_ZEBRA[] = { | 10 | static u32 RF_CHANNEL_TABLE_ZEBRA[] = { |
13 | 0, | 11 | 0, |
14 | 0x085c, //2412 1 | 12 | 0x085c, //2412 1 |
@@ -1279,13 +1277,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u | |||
1279 | 1277 | ||
1280 | RT_TRACE(COMP_CH, "====>%s()====stage:%d, step:%d, channel:%d\n", __FUNCTION__, *stage, *step, channel); | 1278 | RT_TRACE(COMP_CH, "====>%s()====stage:%d, step:%d, channel:%d\n", __FUNCTION__, *stage, *step, channel); |
1281 | // RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); | 1279 | // RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); |
1282 | #ifdef ENABLE_DOT11D | ||
1283 | if (!IsLegalChannel(priv->ieee80211, channel)) | 1280 | if (!IsLegalChannel(priv->ieee80211, channel)) |
1284 | { | 1281 | { |
1285 | RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel); | 1282 | RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n", channel); |
1286 | return true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop. | 1283 | return true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop. |
1287 | } | 1284 | } |
1288 | #endif | ||
1289 | //FIXME:need to check whether channel is legal or not here.WB | 1285 | //FIXME:need to check whether channel is legal or not here.WB |
1290 | 1286 | ||
1291 | 1287 | ||