]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
staging: rtl8192e: Remove dead code associated with RTL8192U
authorLarry Finger <Larry.Finger@lwfinger.net>
Tue, 12 Jul 2011 03:52:12 +0000 (22:52 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Wed, 24 Aug 2011 01:14:06 +0000 (20:14 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
drivers/staging/rtl8192e/rtl819x_HTProc.c
drivers/staging/rtl8192e/rtl_dm.c
drivers/staging/rtl8192e/rtllib.h

index 8bb51e215dedb33a9398e62966fe790808a046e4..0f5410c2c16082feeb49c577ba52734eba4645f4 100644 (file)
@@ -382,33 +382,12 @@ bool HTIOTActIsDisableMCS15(struct rtllib_device* ieee)
 {
        bool retValue = false;
 
-#if defined(RTL8192U)
-       if (ieee->current_network.bssht.bdBandWidth == HT_CHANNEL_WIDTH_20_40)
-       retValue = true;
-       else
-               retValue = false;
-#endif
-
-
        return retValue;
 }
 
 bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device* ieee)
 {
        bool retValue = false;
-#ifdef RTL8192U
-       struct rtllib_network* net = &ieee->current_network;
-
-       if ((ieee->pHTInfo->bCurrentHTSupport == true) && (ieee->pairwise_key_type == KEY_TYPE_CCMP))
-       {
-               if ((memcmp(net->bssid, BELKINF5D8233V1_RALINK, 3)==0) ||
-                               (memcmp(net->bssid, PCI_RALINK, 3)==0) ||
-                               (memcmp(net->bssid, EDIMAX_RALINK, 3)==0))
-               {
-                       retValue = false;
-               }
-       }
-#endif
        return retValue;
 }
 
index b0442e4951753600fb9d44e71f93527aafb4d57c..a738f666e703b6c40a945faeb2ddb6049dfc8b91 100644 (file)
@@ -672,9 +672,6 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev)
        u32                                             Value;
        u8                                              Pwr_Flag;
        u16                                     Avg_TSSI_Meas, TSSI_13dBm, Avg_TSSI_Meas_from_driver=0;
-#ifdef RTL8192U
-       RT_STATUS                               rtStatus = RT_STATUS_SUCCESS;
-#endif
        u32                                             delta=0;
        RT_TRACE(COMP_POWER_TRACKING,"%s()\n",__func__);
        write_nic_byte(dev, Pw_Track_Flag, 0);
@@ -695,15 +692,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev)
        tx_cmd.Op               = TXCMD_SET_TX_PWR_TRACKING;
        tx_cmd.Length   = 4;
        tx_cmd.Value            = Value;
-#ifdef RTL8192U
-       rtStatus = SendTxCommandPacket(dev, &tx_cmd, 12);
-       if (rtStatus == RT_STATUS_FAILURE)
-       {
-               RT_TRACE(COMP_POWER_TRACKING, "Set configuration with tx cmd queue fail!\n");
-       }
-#else
        cmpk_message_handle_tx(dev, (u8*)&tx_cmd, DESC_PACKET_TYPE_INIT, sizeof(DCMD_TXCMD_T));
-#endif
        mdelay(1);
        for (i = 0;i <= 30; i++)
        {
@@ -2843,22 +2832,6 @@ dm_Init_WA_Broadcom_IOT(struct net_device * dev)
 
 static void    dm_check_pbc_gpio(struct net_device *dev)
 {
-#ifdef RTL8192U
-       struct r8192_priv *priv = rtllib_priv(dev);
-       u8 tmp1byte;
-
-
-       tmp1byte = read_nic_byte(dev,GPI);
-       if (tmp1byte == 0xff)
-       return;
-
-       if (tmp1byte&BIT6 || tmp1byte&BIT0)
-       {
-               RT_TRACE(COMP_IO, "CheckPbcGPIO - PBC is pressed\n");
-               priv->bpbc_pressed = true;
-       }
-#endif
-
 }
 
 #ifdef RTL8192E
index 16571aa2083d9530289459d69b328c21f958e91d..25ecf30910eff430d5995e8721943ce8840145dc 100644 (file)
@@ -2378,10 +2378,6 @@ struct rtllib_device {
        /* Probe / Beacon management */
        struct list_head network_free_list;
        struct list_head network_list;
-#ifdef RTL8192U
-       struct list_head network_bssid_free_list;
-       struct list_head network_bssid_list;
-#endif
        struct rtllib_network *networks;
        int scans;
        int scan_age;