rtlwifi: Convert core routines for addition of rtl8192se and rtl8192de

Convert core routines for addition of RTL8192SE and RTL8192DE code.

Additional files are changed to allow compilation.

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/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 7c52435a1180..4776cd1ee4f8 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1445,12 +1445,8 @@ struct rtl_intf_ops {
         int (*adapter_start) (struct ieee80211_hw *hw);
         void (*adapter_stop) (struct ieee80211_hw *hw);
 
-#if 0   /* temporary */
         int (*adapter_tx) (struct ieee80211_hw *hw, struct sk_buff *skb,
                         struct rtl_tcb_desc *ptcb_desc);
-#else
-        int (*adapter_tx) (struct ieee80211_hw *hw, struct sk_buff *skb);
-#endif
         void (*flush)(struct ieee80211_hw *hw, bool drop);
         int (*reset_trx_ring) (struct ieee80211_hw *hw);
         bool (*waitq_insert) (struct ieee80211_hw *hw, struct sk_buff *skb);