From: Larry Finger Date: Thu, 14 Jul 2011 15:19:49 +0000 (-0500) Subject: staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG... X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~132^2~21 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce403a6ac41ff2e745ddb415d83275eaf2207082;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index 72ec73751cc3..7fb33c9baa0e 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/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/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 5f65b58286ce..e4fdcbd376d4 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/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/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c index 0855ad8a0f6e..db4c5684a4e2 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/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. */