rtlwifi: rtl8192ce: Change rtl8192ce routines phy and trx and modify rtl8192cu for addition of rtl8192se and rtl8192de

Change rtl8192ce routines phy and trx for addition of RTL8192SE and RTL8192DE.
In addition, make necessary modifications to rtl8192cu. This patch also
removes the temporary patches needed to enable intermediate steps to build
without error.

Signed-off-by: Chaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index e496361fa2c..aeb0901ce71 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -584,9 +584,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
                                 _rtl_update_earlymode_info(hw, skb,
                                                            &tcb_desc, tid);
 
-#if 0   /* temporary */
                         rtlpriv->intf_ops->adapter_tx(hw, skb, &tcb_desc);
-#endif
                 }
         }
 }
@@ -1100,10 +1098,8 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         hdr = rtl_get_hdr(pskb);
         info = IEEE80211_SKB_CB(pskb);
         pdesc = &ring->desc[0];
-#if 0   /* temporary */
         rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *) pdesc,
                 info, pskb, BEACON_QUEUE, &tcb_desc);
-#endif
 
         __skb_queue_tail(&ring->queue, pskb);