diff for duplicates of <20101130153514.GA6479@debian.home> diff --git a/a/1.txt b/N1/1.txt index d415e2b..e5bcc8f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,7 +166,7 @@ index c8ca9d8..b34dc52 100644 case MFIE_TYPE_COUNTRY: IEEE80211_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n", info_element->len); - //printk("===>Receive <%s> Country IE\n",network->ssid); + //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 @@ -249,11 +249,11 @@ index bc8c425..1285888 100644 /* this function can be called in two situations * 1- We have switched to ad-hoc mode and we are @@ -471,9 +463,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) - if (ieee->state = IEEE80211_LINKED) + if (ieee->state == IEEE80211_LINKED) goto out; ieee->set_chan(ieee->dev, ch); -#ifdef ENABLE_DOT11D - if(channel_map[ch] = 1) + if(channel_map[ch] == 1) -#endif ieee80211_send_probe_requests(ieee); @@ -297,11 +297,11 @@ index bc8c425..1285888 100644 -#else - }while(!ieee->channel_map[ieee->current_network.channel]); -#endif - if (ieee->scanning = 0 ) + if (ieee->scanning == 0 ) goto out; ieee->set_chan(ieee->dev, ieee->current_network.channel); -#ifdef ENABLE_DOT11D - if(channel_map[ieee->current_network.channel] = 1) + if(channel_map[ieee->current_network.channel] == 1) -#endif ieee80211_send_probe_requests(ieee); @@ -331,7 +331,7 @@ index bc8c425..1285888 100644 } -#endif if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){ - if (ieee->scanning = 0){ + if (ieee->scanning == 0){ ieee->scanning = 1; @@ -657,7 +629,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee) /* called with wx_sem held */ @@ -354,8 +354,8 @@ index bc8c425..1285888 100644 -#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. - // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state = IEEE80211_NOLINK)) - if (ieee->state = IEEE80211_NOLINK) + // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) + if (ieee->state == IEEE80211_NOLINK) ieee->current_network.channel = 6; -#endif /* if not then the state is not linked. Maybe the user swithced to @@ -481,10 +481,10 @@ index 494f180..0bdeacf 100644 } -#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 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 ||\ + (_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) { @@ -507,7 +507,7 @@ index 494f180..0bdeacf 100644 - ch=channels; - priv->ChannelPlan= 0;//hikaru - // set channels 1..14 allowed in given locale -- for (i=1; i<\x14; i++) { +- for (i=1; i<=14; i++) { - (priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01); - ch >>= 1; - } @@ -557,12 +557,12 @@ index a3adaed..ac84ff7 100644 0x085c, //2412 1 @@ -1257,13 +1255,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u - RT_TRACE(COMP_CH, "==>%s()==stage:%d, step:%d, channel:%d\n", __FUNCTION__, *stage, *step, channel); + RT_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); + 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 diff --git a/a/content_digest b/N1/content_digest index 8327e48..967f07d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\020101128211955.GD30799@bicker\0" "From\0David Chosrova <david.chosrova@libertysurf.fr>\0" "Subject\0[PATCH] Staging: rtl8192u: remove dead code to disable dot11d\0" - "Date\0Tue, 30 Nov 2010 15:35:14 +0000\0" + "Date\0Tue, 30 Nov 2010 16:35:14 +0100\0" "To\0gregkh@suse.de\0" "Cc\0devel@driverdev.osuosl.org" error27@gmail.com @@ -183,7 +183,7 @@ " \t\tcase MFIE_TYPE_COUNTRY:\n" " \t\t\tIEEE80211_DEBUG_SCAN(\"MFIE_TYPE_COUNTRY: %d bytes\\n\",\n" " \t\t\t\t\t info_element->len);\n" - " \t\t\t//printk(\"===>Receive <%s> Country IE\\n\",network->ssid);\n" + " \t\t\t//printk(\"=====>Receive <%s> Country IE\\n\",network->ssid);\n" " \t\t\tieee80211_extract_country_ie(ieee, info_element, network, network->bssid);//addr2 is same as addr3 when from an AP\n" " \t\t\tbreak;\n" "-#endif\n" @@ -266,11 +266,11 @@ " \t\t/* this function can be called in two situations\n" " \t\t * 1- We have switched to ad-hoc mode and we are\n" "@@ -471,9 +463,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)\n" - " \t\tif (ieee->state = IEEE80211_LINKED)\n" + " \t\tif (ieee->state == IEEE80211_LINKED)\n" " \t\t\tgoto out;\n" " \t\tieee->set_chan(ieee->dev, ch);\n" "-#ifdef ENABLE_DOT11D\n" - " \t\tif(channel_map[ch] = 1)\n" + " \t\tif(channel_map[ch] == 1)\n" "-#endif\n" " \t\tieee80211_send_probe_requests(ieee);\n" " \n" @@ -314,11 +314,11 @@ "-#else\n" "-\t}while(!ieee->channel_map[ieee->current_network.channel]);\n" "-#endif\n" - " \tif (ieee->scanning = 0 )\n" + " \tif (ieee->scanning == 0 )\n" " \t\tgoto out;\n" " \tieee->set_chan(ieee->dev, ieee->current_network.channel);\n" "-#ifdef ENABLE_DOT11D\n" - " \tif(channel_map[ieee->current_network.channel] = 1)\n" + " \tif(channel_map[ieee->current_network.channel] == 1)\n" "-#endif\n" " \tieee80211_send_probe_requests(ieee);\n" " \n" @@ -348,7 +348,7 @@ " \t}\n" "-#endif\n" " \tif (ieee->softmac_features & IEEE_SOFTMAC_SCAN){\n" - " \t\tif (ieee->scanning = 0){\n" + " \t\tif (ieee->scanning == 0){\n" " \t\t\tieee->scanning = 1;\n" "@@ -657,7 +629,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee)\n" " /* called with wx_sem held */\n" @@ -371,8 +371,8 @@ " \n" " \n" "-#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.\n" - " //\tif((IS_DOT11D_ENABLE(ieee)) && (ieee->state = IEEE80211_NOLINK))\n" - " \tif (ieee->state = IEEE80211_NOLINK)\n" + " //\tif((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK))\n" + " \tif (ieee->state == IEEE80211_NOLINK)\n" " \t\tieee->current_network.channel = 6;\n" "-#endif\n" " \t/* if not then the state is not linked. Maybe the user swithced to\n" @@ -498,10 +498,10 @@ " }\n" "-#endif\n" " \n" - "-#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 )\n" + "-#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 )\n" " \n" " #define \trx_hal_is_cck_rate(_pdrvinfo)\\\n" - " \t\t\t(_pdrvinfo->RxRate = DESC90_RATE1M ||\\\n" + " \t\t\t(_pdrvinfo->RxRate == DESC90_RATE1M ||\\\n" "@@ -3155,7 +3150,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)\n" " short rtl8192_get_channel_map(struct net_device * dev)\n" " {\n" @@ -524,7 +524,7 @@ "-\tch=channels;\n" "-\tpriv->ChannelPlan= 0;//hikaru\n" "-\t // set channels 1..14 allowed in given locale\n" - "-\tfor (i=1; i<\024; i++) {\n" + "-\tfor (i=1; i<=14; i++) {\n" "-\t\t(priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01);\n" "-\t\tch >>= 1;\n" "-\t}\n" @@ -574,12 +574,12 @@ " \t0x085c, //2412 1\n" "@@ -1257,13 +1255,11 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u\n" " \n" - " \tRT_TRACE(COMP_CH, \"==>%s()==stage:%d, step:%d, channel:%d\\n\", __FUNCTION__, *stage, *step, channel);\n" + " \tRT_TRACE(COMP_CH, \"====>%s()====stage:%d, step:%d, channel:%d\\n\", __FUNCTION__, *stage, *step, channel);\n" " //\tRT_ASSERT(IsLegalChannel(Adapter, channel), (\"illegal channel: %d\\n\", channel));\n" "-#ifdef ENABLE_DOT11D\n" " \tif (!IsLegalChannel(priv->ieee80211, channel))\n" " \t{\n" - " \t\tRT_TRACE(COMP_ERR, \"=======>set to illegal channel:%d\\n\", channel);\n" + " \t\tRT_TRACE(COMP_ERR, \"=============>set to illegal channel:%d\\n\", channel);\n" " \t\treturn true; //return true to tell upper caller function this channel setting is finished! Or it will in while loop.\n" " \t}\n" "-#endif\n" @@ -682,4 +682,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -ea2ed02182a62137ae2b1953d56070ff6721e7b8a63f8d5cbac78c1e05df1568 +a93344cbf2d2533b6e868f84dd4262a6f4b3e019e70ec774ba8019d1d42f05e3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.