Fix sparse message rtl8192u
Subsystems (2)
PATCH 1/1 Fix sparse message rtl8192u
Hello,
Fix sparse message:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined In file included from drivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition
if ENABLE_DOT11D is enabled eqMacAddr is defined twice.
(quoted diff) +0 -0
b/drivers/staging/rtl8192u/r8192U_core.c
index 494f180..4a4a747 100644
drivers/staging/rtl8192u/r8192U_core.c +0 -0
@@ -242,10 +242,12 @@ static void rtl819x_set_channel_map(u8 channel_plan,
struct r8192_priv* priv)
}
return; }
-#endif
+#else
#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 )
+#endif
+
#define rx_hal_is_cck_rate(_pdrvinfo)\
(_pdrvinfo->RxRate = DESC90_RATE1M ||\
_pdrvinfo->RxRate = DESC90_RATE2M ||\Quoted 4 lines · On Wed, Nov 24, 2010 at 10:41:43PM +0100, [email protected] wrote:
Hello,
Quoted 9 lines
Fix sparse message:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined In file included fromdrivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definitionif
ENABLE_DOT11Dis enabled eqMacAddr is defined twice.
It would be better to remove the #ifdef around the include "dot11d.h" and delete this definition.
Also your email client is line wrapping on long lines and changing tabs to spaces. Read Documentation/email-clients.txt then send an email to yourself. Save the raw email (including email headers and everything) then cat email.txt | patch -p1 Resend when the patch applies.
CC the maintainers when you resend:
Greg Kroah-Hartman <[email protected]>,
[email protected]
regards,
dan carpenter
Hello,
Ok I'll check this out and send back the patch.
Thanks for the feedback.
Regards.
David Chosrova
Quoted 28 lines · Dan Carpenter
Quoted 4 lines · On Wed, Nov 24, 2010 at 10:41:43PM +0100, [email protected] wrote:
Hello,
Quoted 9 lines
Fix sparse message:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined In file included fromdrivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definitionif
ENABLE_DOT11Dis enabled eqMacAddr is defined twice.It would be better to remove the #ifdef around the include "
dot11d.h" and delete this definition.Also your email client is line wrapping on long lines and changing tabs to spaces. Read
Documentation/email-clients.txtthen send an email to yourself. Save the raw email (including email headers and everything) thencat email.txt | patch -p1Resend when the patch applies.CC the maintainers when you resend:
Greg Kroah-Hartman <[email protected]>,
[email protected]
Quoted 8 lines
regards,
dan carpenter--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 4 lines · david chosrova
Hello,
Ok I'll check this out and send back the patch.
You'll have to remove the ifdef from the dot11d.h file as well.
The ENABLE_DOT11D is the stuff which limits the radio frequencies based on the country. It's always defined in this driver. If you wanted to remove those ifdefs completely that would be great too.
regards,
dan carpenter
Hello,
In this patch I have removed the #ifdef ENABLE_DOT11D.
Compiled.
Thanks for the feedback.
drivers/staging/rtl8192u/Makefile +1 -1
@@ -9,7 +9,7 @@ ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO #ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE #ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT ccflags-y += -DUSE_ONE_PIPE -ccflags-y += -DENABLE_DOT11D +#ccflags-y += -DENABLE_DOT11D ccflags-y += -Idrivers/staging/rtl8192u/ieee80211 r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \
drivers/staging/rtl8192u/dot11d.h +0 -2
@@ -1,7 +1,6 @@#ifndef __INC_DOT11D_H#define __INC_DOT11D_H -#ifdef ENABLE_DOT11D #include "ieee80211/ieee80211.h"
@@ -98,5 +97,4 @@ int ToLegalChannel(struct ieee80211_device *dev, u8 channel ); -#endif /* ENABLE_DOT11D */ #endif /* #ifndef __INC_DOT11D_H */
drivers/staging/rtl8192u/ieee80211/Makefile +0 -1
@@ -20,7 +20,6 @@ ifeq ($(NIC_SELECT),RTL8192U) endif #ccflags-y := -DJOHN_NOCPY #flags to enable or disble 80211D feature -ccflags-y += -DENABLE_DOT11D ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \
drivers/staging/rtl8192u/ieee80211/dot11d.c +0 -2
@@ -1,4 +1,3 @@ -#ifdef ENABLE_DOT11D //----------------------------------------------------------------------------- // File: // Dot11d.c
@@ -220,4 +219,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete);EXPORT_SYMBOL (IsLegalChannel);EXPORT_SYMBOL (ToLegalChannel); -#endif
drivers/staging/rtl8192u/ieee80211/dot11d.h +0 -2
@@ -1,7 +1,6 @@#ifndef __INC_DOT11D_H#define __INC_DOT11D_H -#ifdef ENABLE_DOT11D #include "ieee80211.h" //#define ENABLE_DOT11D
@@ -98,5 +97,4 @@ int ToLegalChannel(struct ieee80211_device * dev, u8 channel ); -#endif //ENABLE_DOT11D #endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8192u/ieee80211/ieee80211.h +0 -8
@@ -1572,10 +1572,8 @@ struct ieee80211_network {#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas #endif -#ifdef ENABLE_DOT11D u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ]; -#endif // HT Related, by amy, 2008.04.29 BSS_HT bssht;// Add to handle broadcom AP management frame CCK rate.
@@ -1769,7 +1767,6 @@ typedef u32 RT_RF_CHANGE_SOURCE;#define RF_CHANGE_BY_IPS BIT28#define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. -#ifdef ENABLE_DOT11D typedef enum { COUNTRY_CODE_FCC = 0,
@@ -1784,7 +1781,6 @@ typedef enumCOUNTRY_CODE_MIC , COUNTRY_CODE_GLOBAL_DOMAIN }country_code_type_t; -#endif #define RT_MAX_LD_SLOT_NUM 10 typedef struct _RT_LINK_DETECT_T{
@@ -1970,12 +1966,8 @@ struct ieee80211_device {/* map of allowed channels. 0 is dummy */ // FIXME: remeber to default to a basic channel plan depending of the PHY type -#ifdef ENABLE_DOT11D void * pDot11dInfo;bool bGlobalDomain; -#else -int channel_map[MAX_CHANNEL_NUMBER +1 ]; -#endif int rate;/* current rate */ int basic_rate;//FIXME: pleace callback, see if redundant with softmac_features
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +0 -12
@@ -44,9 +44,7 @@#include <linux/ctype.h> #include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static inline void ieee80211_monitor_rx (struct ieee80211_device *ieee,struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats)
@@ -1599,7 +1597,6 @@ static const char *get_info_element_string(u16 id) }#endif -#ifdef ENABLE_DOT11D static inline void ieee80211_extract_country_ie( struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -1632,7 +1629,6 @@ static inline void ieee80211_extract_country_ie( } } -#endif int ieee80211_parse_info_param(struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -2086,14 +2082,12 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, "QoS Error need to parse QOS_PARAMETER IE\n");break ; -#ifdef ENABLE_DOT11D case MFIE_TYPE_COUNTRY :IEEE80211_DEBUG_SCAN ("MFIE_TYPE_COUNTRY: %d bytes\n" , info_element->len);//printk("===>Receive <%s> Country IE\n",network->ssid); ieee80211_extract_country_ie (ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP break ; -#endif /* TODO */ default :IEEE80211_DEBUG_MGMT
@@ -2229,10 +2223,8 @@ static inline int ieee80211_network_init(#ifdef THOMAS_TURBO network->Turbo_Enable =0 ;#endif -#ifdef ENABLE_DOT11D network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN ); -#endif //Initialize HT parameters //ieee80211_ht_initialize(&network->bssht); HTInitializeBssDesc (&network->bssht);
@@ -2399,10 +2391,8 @@ static inline void update_network(struct ieee80211_network *dst, dst->Turbo_Enable = src->Turbo_Enable;#endif -#ifdef ENABLE_DOT11D dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); -#endif //added by amy for LEAP dst->bWithAironetIE = src->bWithAironetIE;
@@ -2470,7 +2460,6 @@ static inline void ieee80211_process_probe_response(return ; } -#ifdef ENABLE_DOT11D // For Asus EeePc request, // (1) if wireless adapter receive get any 802.11d country code in AP beacon, // wireless adapter should follow the country code.
@@ -2527,7 +2516,6 @@ static inline void ieee80211_process_probe_response( } } } -#endif /* The network parsed correctly -- so now we scan our known networks * to see if we can find it in our list.
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -44
192 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +0 -4
@@ -15,9 +15,7 @@#include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif /* FIXME: add A freqs */ const long ieee80211_wlan_frequencies[] = {
@@ -63,12 +61,10 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info }else {/* Set the channel */ -#ifdef ENABLE_DOT11D if (!(GET_DOT11D_INFO (ieee)->channel_map)[fwrq->m]) { ret = -EINVAL ; goto out; } -#endif ieee->current_network.channel = fwrq->m; ieee->set_chan (ieee->dev, ieee->current_network.channel);
drivers/staging/rtl8192u/r8192U_core.c +0 -21
@@ -77,9 +77,7 @@ double __extendsfdf2(float a) {return a;}#include "r8192_pm.h" #endif -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif //set here to open your trace code. //WB u32 rt_global_debug_component = \ // COMP_INIT |
@@ -166,7 +164,6 @@ static struct usb_driver rtl8192_usb_driver = {#endif }; -#ifdef ENABLE_DOT11D typedef struct _CHANNEL_LIST {
@@ -242,9 +239,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv) }return ; } -#endif -#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 )#define rx_hal_is_cck_rate (_pdrvinfo)\ (_pdrvinfo->RxRate = DESC90_RATE1M ||\
@@ -3155,7 +3150,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)short rtl8192_get_channel_map (struct net_device * dev) {struct r8192_priv *priv =ieee80211_priv (dev); -#ifdef ENABLE_DOT11D if (priv->ChannelPlan >COUNTRY_CODE_GLOBAL_DOMAIN ){printk ("rtl8180_init:Error channel plan! Set to default.\n" ); priv->ChannelPlan=0 ;
@@ -3163,21 +3157,6 @@ short rtl8192_get_channel_map(struct net_device * dev)RT_TRACE (COMP_INIT ,"Channel plan is %d\n" ,priv->ChannelPlan);rtl819x_set_channel_map (priv->ChannelPlan, priv); -#else -int ch,i; -//Set Default Channel Plan -if (!channels){ -DMESG ("No channels, aborting" ); -return -1 ; - } - ch=channels; - priv->ChannelPlan=0 ;//hikaru -// set channels 1..14 allowed in given locale - for (i=1; i<; i++) { - (priv->ieee80211->channel_map)[i] = (u8)(ch &0x01 ); - ch >>=1 ; - } -#endif return 0 ; }
drivers/staging/rtl8192u/r8192U_wx.c +0 -6
@@ -21,9 +21,7 @@#include "r8192U.h" #include "r8192U_hw.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif #define RATE_COUNT 12u32 rtl8180_rates[] = {1000000 ,2000000 ,5500000 ,11000000 ,
@@ -458,11 +456,7 @@ static int rtl8180_wx_get_range(struct net_device *dev,for (i =0 , val =0 ; i <14 ; i++) {// Include only legal frequencies for some countries -#ifdef ENABLE_DOT11D if ((GET_DOT11D_INFO (priv->ieee80211)->channel_map)[i+1 ]) { -#else -if ((priv->ieee80211->channel_map)[i+1 ]) { -#endif range->freq[val].i = i +1 ; range->freq[val].m = ieee80211_wlan_frequencies[i] *100000 ; range->freq[val].e =1 ;
drivers/staging/rtl8192u/r819xU_phy.c +0 -4
@@ -6,9 +6,7 @@#include "r8192U_dm.h" #include "r819xU_firmware_img.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static u32 RF_CHANNEL_TABLE_ZEBRA [] = {0 ,0x085c ,//2412 1
@@ -1257,13 +1255,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, uRT_TRACE (COMP_CH ,"==>%s()==stage:%d, step:%d, channel:%d\n" , __FUNCTION__, *stage, *step, channel);// RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); -#ifdef ENABLE_DOT11D if (!IsLegalChannel (priv->ieee80211, channel)) {RT_TRACE (COMP_ERR ,"=======>set to illegal channel:%d\n" , channel);return true;//return true to tell upper caller function this channel setting is finished! Or it will in while loop. } -#endif //FIXME:need to check whether channel is legal or not here.WB
Quoted 15 lines · Dan Carpenter
Quoted 4 lines · david chosrova
Hello,
Ok I'll check this out and send back the patch.
You'll have to remove the ifdef from the
dot11d.hfile as well.The
ENABLE_DOT11Dis the stuff which limits the radio frequencies based on the country. It's always defined in this driver. If you wanted to remove those ifdefs completely that would be great too.regards,
dan carpenter
Quoted 4 lines · David Chosrova
Hello,
In this patch I have removed the #ifdef
ENABLE_DOT11D.
Cool man. Looks good.
There are several places where ENABLE_DOT11D is still there in the comments. Can do a: grep ENABLE_DOT11D drivers/staging/rtl8192u/ -R and remove all those?
Then add an:
When people apply patches they try to automate the process. They have scripts that automatically take an email and creates a kernel patch. So choose a good subject and write a patch description. I would normally write this:
Subject: [patch] Staging: rtl8192u: remove dead code to disable dot11d
This patch removes all the ENABLE_DOT11D ifdefs. It's always enabled for this driver. DOT11D has to do with regulatory domains.
What prompted this patch was a warning message in Sparse:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included from drivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition
Now there are no ifdefs around dot11d.h it made no sense to have this second definition, so I removed that macro as well.
---
Edit that however you want. That's just an idea.
Don't put the "Hello etc" into the message because Greg will have to strip those bits out of the patch description by hand.
After the Signed-off-by: line put three dashes "---". Things below that line get stripped out of the patch description. That's where you can put the "Compile tested." or "Feedback requested" stuff if you want.
Send your email to: [email protected]
CC these addresses: [email protected], [email protected], [email protected], [email protected], [email protected]
regards,
dan carpenter
PATCH 1/1 Staging: rtl8192u: remove dead code to disable dot11d
I resend the patch as the one before did not rech the kernel-janitors list.
This patch removes all the ENABLE_DOT11D ifdefs.
It is always defined for this driver.
DOT11D has to do with regulatory domains.
What prompted this patch was a warning message in Sparse:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included from drivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition
Now there are no idefs around dot11d.h,it made no sense to have this second definition, so I removed that macro as well. ( Thanks Dan ;-) ).
---
drivers/staging/rtl8192u/Makefile +0 -1
@@ -9,7 +9,6 @@ ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO #ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE #ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT ccflags-y += -DUSE_ONE_PIPE -ccflags-y += -DENABLE_DOT11D ccflags-y += -Idrivers/staging/rtl8192u/ieee80211 r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \
drivers/staging/rtl8192u/dot11d.h +0 -2
@@ -1,7 +1,6 @@#ifndef __INC_DOT11D_H#define __INC_DOT11D_H -#ifdef ENABLE_DOT11D #include "ieee80211/ieee80211.h"
@@ -98,5 +97,4 @@ int ToLegalChannel(struct ieee80211_device *dev, u8 channel ); -#endif /* ENABLE_DOT11D */ #endif /* #ifndef __INC_DOT11D_H */
drivers/staging/rtl8192u/ieee80211/dot11d.c +0 -2
@@ -1,4 +1,3 @@ -#ifdef ENABLE_DOT11D //----------------------------------------------------------------------------- // File: // Dot11d.c
@@ -220,4 +219,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete);EXPORT_SYMBOL (IsLegalChannel);EXPORT_SYMBOL (ToLegalChannel); -#endif
drivers/staging/rtl8192u/ieee80211/dot11d.h +0 -2
@@ -1,7 +1,6 @@#ifndef __INC_DOT11D_H#define __INC_DOT11D_H -#ifdef ENABLE_DOT11D #include "ieee80211.h" //#define ENABLE_DOT11D
@@ -98,5 +97,4 @@ int ToLegalChannel(struct ieee80211_device * dev, u8 channel ); -#endif //ENABLE_DOT11D #endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8192u/ieee80211/ieee80211.h +0 -8
@@ -1572,10 +1572,8 @@ struct ieee80211_network {#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas #endif -#ifdef ENABLE_DOT11D u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ]; -#endif // HT Related, by amy, 2008.04.29 BSS_HT bssht;// Add to handle broadcom AP management frame CCK rate.
@@ -1769,7 +1767,6 @@ typedef u32 RT_RF_CHANGE_SOURCE;#define RF_CHANGE_BY_IPS BIT28#define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. -#ifdef ENABLE_DOT11D typedef enum { COUNTRY_CODE_FCC = 0,
@@ -1784,7 +1781,6 @@ typedef enumCOUNTRY_CODE_MIC , COUNTRY_CODE_GLOBAL_DOMAIN }country_code_type_t; -#endif #define RT_MAX_LD_SLOT_NUM 10 typedef struct _RT_LINK_DETECT_T{
@@ -1970,12 +1966,8 @@ struct ieee80211_device {/* map of allowed channels. 0 is dummy */ // FIXME: remeber to default to a basic channel plan depending of the PHY type -#ifdef ENABLE_DOT11D void * pDot11dInfo;bool bGlobalDomain; -#else -int channel_map[MAX_CHANNEL_NUMBER +1 ]; -#endif int rate;/* current rate */ int basic_rate;//FIXME: pleace callback, see if redundant with softmac_features
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +0 -13
@@ -43,10 +43,7 @@#include <asm/uaccess.h> #include <linux/ctype.h> -#include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static inline void ieee80211_monitor_rx (struct ieee80211_device *ieee,struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats)
@@ -1599,7 +1596,6 @@ static const char *get_info_element_string(u16 id) }#endif -#ifdef ENABLE_DOT11D static inline void ieee80211_extract_country_ie( struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -1632,7 +1628,6 @@ static inline void ieee80211_extract_country_ie( } } -#endif int ieee80211_parse_info_param(struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -2086,14 +2081,12 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, "QoS Error need to parse QOS_PARAMETER IE\n");break ; -#ifdef ENABLE_DOT11D case MFIE_TYPE_COUNTRY :IEEE80211_DEBUG_SCAN ("MFIE_TYPE_COUNTRY: %d bytes\n" , info_element->len);//printk("===>Receive <%s> Country IE\n",network->ssid); ieee80211_extract_country_ie (ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP break ; -#endif /* TODO */ default :IEEE80211_DEBUG_MGMT
@@ -2229,10 +2222,8 @@ static inline int ieee80211_network_init(#ifdef THOMAS_TURBO network->Turbo_Enable =0 ;#endif -#ifdef ENABLE_DOT11D network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN ); -#endif //Initialize HT parameters //ieee80211_ht_initialize(&network->bssht); HTInitializeBssDesc (&network->bssht);
@@ -2399,10 +2390,8 @@ static inline void update_network(struct ieee80211_network *dst, dst->Turbo_Enable = src->Turbo_Enable;#endif -#ifdef ENABLE_DOT11D dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); -#endif //added by amy for LEAP dst->bWithAironetIE = src->bWithAironetIE;
@@ -2470,7 +2459,6 @@ static inline void ieee80211_process_probe_response(return ; } -#ifdef ENABLE_DOT11D // For Asus EeePc request, // (1) if wireless adapter receive get any 802.11d country code in AP beacon, // wireless adapter should follow the country code.
@@ -2527,7 +2515,6 @@ static inline void ieee80211_process_probe_response( } } } -#endif /* The network parsed correctly -- so now we scan our known networks * to see if we can find it in our list.
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -44
192 lines not on this page · raw message
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +0 -4
@@ -15,9 +15,7 @@#include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif /* FIXME: add A freqs */ const long ieee80211_wlan_frequencies[] = {
@@ -63,12 +61,10 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info }else {/* Set the channel */ -#ifdef ENABLE_DOT11D if (!(GET_DOT11D_INFO (ieee)->channel_map)[fwrq->m]) { ret = -EINVAL ; goto out; } -#endif ieee->current_network.channel = fwrq->m; ieee->set_chan (ieee->dev, ieee->current_network.channel);
drivers/staging/rtl8192u/r8192U_core.c +0 -21
@@ -77,9 +77,7 @@ double __extendsfdf2(float a) {return a;}#include "r8192_pm.h" #endif -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif //set here to open your trace code. //WB u32 rt_global_debug_component = \ // COMP_INIT |
@@ -166,7 +164,6 @@ static struct usb_driver rtl8192_usb_driver = {#endif }; -#ifdef ENABLE_DOT11D typedef struct _CHANNEL_LIST {
@@ -242,9 +239,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv) }return ; } -#endif -#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 )#define rx_hal_is_cck_rate (_pdrvinfo)\ (_pdrvinfo->RxRate = DESC90_RATE1M ||\
@@ -3155,7 +3150,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)short rtl8192_get_channel_map (struct net_device * dev) {struct r8192_priv *priv =ieee80211_priv (dev); -#ifdef ENABLE_DOT11D if (priv->ChannelPlan >COUNTRY_CODE_GLOBAL_DOMAIN ){printk ("rtl8180_init:Error channel plan! Set to default.\n" ); priv->ChannelPlan=0 ;
@@ -3163,21 +3157,6 @@ short rtl8192_get_channel_map(struct net_device * dev)RT_TRACE (COMP_INIT ,"Channel plan is %d\n" ,priv->ChannelPlan);rtl819x_set_channel_map (priv->ChannelPlan, priv); -#else -int ch,i; -//Set Default Channel Plan -if (!channels){ -DMESG ("No channels, aborting" ); -return -1 ; - } - ch=channels; - priv->ChannelPlan=0 ;//hikaru -// set channels 1..14 allowed in given locale - for (i=1; i<; i++) { - (priv->ieee80211->channel_map)[i] = (u8)(ch &0x01 ); - ch >>=1 ; - } -#endif return 0 ; }
drivers/staging/rtl8192u/r8192U_wx.c +0 -6
@@ -21,9 +21,7 @@#include "r8192U.h" #include "r8192U_hw.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif #define RATE_COUNT 12u32 rtl8180_rates[] = {1000000 ,2000000 ,5500000 ,11000000 ,
@@ -458,11 +456,7 @@ static int rtl8180_wx_get_range(struct net_device *dev,for (i =0 , val =0 ; i <14 ; i++) {// Include only legal frequencies for some countries -#ifdef ENABLE_DOT11D if ((GET_DOT11D_INFO (priv->ieee80211)->channel_map)[i+1 ]) { -#else -if ((priv->ieee80211->channel_map)[i+1 ]) { -#endif range->freq[val].i = i +1 ; range->freq[val].m = ieee80211_wlan_frequencies[i] *100000 ; range->freq[val].e =1 ;
drivers/staging/rtl8192u/r819xU_phy.c +0 -4
@@ -6,9 +6,7 @@#include "r8192U_dm.h" #include "r819xU_firmware_img.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static u32 RF_CHANNEL_TABLE_ZEBRA [] = {0 ,0x085c ,//2412 1
@@ -1257,13 +1255,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, uRT_TRACE (COMP_CH ,"==>%s()==stage:%d, step:%d, channel:%d\n" , __FUNCTION__, *stage, *step, channel);// RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); -#ifdef ENABLE_DOT11D if (!IsLegalChannel (priv->ieee80211, channel)) {RT_TRACE (COMP_ERR ,"=======>set to illegal channel:%d\n" , channel);return true;//return true to tell upper caller function this channel setting is finished! Or it will in while loop. } -#endif //FIXME:need to check whether channel is legal or not here.WB
drivers/staging/rtl8192u/ieee80211/Makefile +0 -2
@@ -20,7 +20,6 @@ ifeq ($(NIC_SELECT),RTL8192U) endif #ccflags-y := -DJOHN_NOCPY #flags to enable or disble 80211D feature -ccflags-y += -DENABLE_DOT11D ieee80211-rsl-objs := ieee80211_rx.o \ ieee80211_softmac.o \ ieee80211_tx.o \
@@ -75,7 +74,6 @@ CFLAGS += -I$(KSRC)/include -I. CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h #Kernel 2.4.20 #CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB -#CFLAGS += -DENABLE_DOT11D SMP := $(shell $(CC) $(MODCFLAGS) -E -dM $(CONFIG_FILE) | \ grep CONFIG_SMP | awk '{print $$3}') ifneq ($(SMP),1)
drivers/staging/rtl8192u/ieee80211/dot11d.h +0 -1
@@ -3,7 +3,6 @@#include "ieee80211.h" -//#define ENABLE_DOT11D //#define DOT11D_MAX_CHNL_NUM 83
Quoted 56 lines · Dan Carpenter
Quoted 4 lines · David Chosrova
Hello,
In this patch I have removed the #ifdef
ENABLE_DOT11D.Cool man. Looks good.
There are several places where
ENABLE_DOT11Dis still there in the comments. Can do a: grepENABLE_DOT11Ddrivers/staging/rtl8192u/-R and remove all those?Then add an:
Acked-by Dan Carpenter <[email protected]>When people apply patches they try to automate the process. They have scripts that automatically take an email and creates a kernel patch. So choose a good subject and write a patch description. I would normally write this:
Subject: [patch] Staging: rtl8192u: remove dead code to disable dot11d
This patch removes all the
ENABLE_DOT11Difdefs. It's always enabled for this driver. DOT11D has to do with regulatory domains.What prompted this patch was a warning message in Sparse:
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included fromdrivers/staging/rtl8192u/:81:81:drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definitionNow there are no ifdefs around
dot11d.hit made no sense to have this second definition, so I removed that macro as well.---
Edit that however you want. That's just an idea.Don't put the "Hello etc" into the message because Greg will have to strip those bits out of the patch description by hand.
After the Signed-off-by: line put three dashes "---". Things below that line get stripped out of the patch description. That's where you can put the "Compile tested." or "Feedback requested" stuff if you want.
Send your email to: [email protected]
CC these addresses: [email protected], [email protected], [email protected], [email protected], [email protected]regards,
dan carpenter
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html