---

yaml --- r: 267683 b: refs/heads/master c: ce403a6 h: refs/heads/master i: 267681: 01cf517 267679: 56ee862 v: v3
git-mirror · Aug 24, 2011 · f3715c9 · f3715c9
1 parent d508456
commit f3715c9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d32ddcba9d67b7d647576df9f8f62934956c60b9
+refs/heads/master: ce403a6ac41ff2e745ddb415d83275eaf2207082
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c
@@ -1360,9 +1360,7 @@ short rtl8192_get_channel_map(struct net_device * dev)
 	}
 	RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan);
 	Dot11d_Init(priv->rtllib);
-#ifndef CONFIG_CRDA
 	Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
-#endif
 	for (i = 1; i <= 11; i++) {
 		(priv->rtllib->active_channel_map)[i] = 1;
 	}

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -525,13 +525,6 @@ void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh)
 
 void rtllib_softmac_hint11d_wq(void *data)
 {
-#ifdef CONFIG_CRDA
-	struct rtllib_device *ieee = container_of_dwork_rsl(data, struct rtllib_device, softmac_hint11d_wq);
-	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
-	struct wireless_dev *wdev = &ieee->wdev;
-
-	regulatory_hint_11d(wdev->wiphy, pDot11dInfo->CountryIeBuf, pDot11dInfo->CountryIeLen);
-#endif
 }
 
 void rtllib_update_active_chan_map(struct rtllib_device *ieee)

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_wx.c b/trunk/drivers/staging/rtl8192e/rtllib_wx.c
@@ -215,7 +215,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
 		start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
         }
 
-#ifndef CUSTOMER_ID_INTEL_CMPC
 	/* add info for WZC */
 	memset(&iwe, 0, sizeof(iwe));
 	if (network->wzc_ie_len)
@@ -226,7 +225,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
 		iwe.u.data.length = network->wzc_ie_len;
 		start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
         }
-#endif
 
 	/* Add EXTRA: Age to display seconds since last beacon/probe response
 	 * for given network. */