rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu

Modify some rtl8192ce routines for merging with rtl8192cu. In addition,
remove some usage of Hungarian notation.

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

1 files changed, 30 insertions, 30 deletions

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index cf0b73e51fc2..1d6cc1f3c6bf 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -399,21 +399,21 @@ static void _rtl_query_protection_mode(struct ieee80211_hw *hw,
         u8 rate_flag = info->control.rates[0].flags;
 
         /* Common Settings */
-        tcb_desc->b_rts_stbc = false;
-        tcb_desc->b_cts_enable = false;
+        tcb_desc->rts_stbc = false;
+        tcb_desc->cts_enable = false;
         tcb_desc->rts_sc = 0;
-        tcb_desc->b_rts_bw = false;
-        tcb_desc->b_rts_use_shortpreamble = false;
-        tcb_desc->b_rts_use_shortgi = false;
+        tcb_desc->rts_bw = false;
+        tcb_desc->rts_use_shortpreamble = false;
+        tcb_desc->rts_use_shortgi = false;
 
         if (rate_flag & IEEE80211_TX_RC_USE_CTS_PROTECT) {
                 /* Use CTS-to-SELF in protection mode. */
-                tcb_desc->b_rts_enable = true;
-                tcb_desc->b_cts_enable = true;
+                tcb_desc->rts_enable = true;
+                tcb_desc->cts_enable = true;
                 tcb_desc->rts_rate = rtlpriv->cfg->maps[RTL_RC_OFDM_RATE24M];
         } else if (rate_flag & IEEE80211_TX_RC_USE_RTS_CTS) {
                 /* Use RTS-CTS in protection mode. */
-                tcb_desc->b_rts_enable = true;
+                tcb_desc->rts_enable = true;
                 tcb_desc->rts_rate = rtlpriv->cfg->maps[RTL_RC_OFDM_RATE24M];
         }
 
@@ -429,7 +429,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                 if (mac->opmode == NL80211_IFTYPE_STATION)
                         tcb_desc->ratr_index = 0;
                 else if (mac->opmode == NL80211_IFTYPE_ADHOC) {
-                        if (tcb_desc->b_multicast || tcb_desc->b_broadcast) {
+                        if (tcb_desc->multicast || tcb_desc->broadcast) {
                                 tcb_desc->hw_rate =
                                     rtlpriv->cfg->maps[RTL_RC_CCK_RATE2M];
                                 tcb_desc->use_driver_rate = 1;
@@ -439,7 +439,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
                 }
         }
 
-        if (rtlpriv->dm.b_useramask) {
+        if (rtlpriv->dm.useramask) {
                 /* TODO we will differentiate adhoc and station futrue  */
                 tcb_desc->mac_id = 0;
 
@@ -461,19 +461,19 @@ static void _rtl_query_bandwidth_mode(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        tcb_desc->b_packet_bw = false;
+        tcb_desc->packet_bw = false;
 
         if (!mac->bw_40 || !mac->ht_enable)
                 return;
 
-        if (tcb_desc->b_multicast || tcb_desc->b_broadcast)
+        if (tcb_desc->multicast || tcb_desc->broadcast)
                 return;
 
         /*use legency rate, shall use 20MHz */
         if (tcb_desc->hw_rate <= rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M])
                 return;
 
-        tcb_desc->b_packet_bw = true;
+        tcb_desc->packet_bw = true;
 }
 
 static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw)
@@ -545,9 +545,9 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                 }
 
                 if (is_multicast_ether_addr(ieee80211_get_DA(hdr)))
-                        tcb_desc->b_multicast = 1;
+                        tcb_desc->multicast = 1;
                 else if (is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
-                        tcb_desc->b_broadcast = 1;
+                        tcb_desc->broadcast = 1;
 
                 _rtl_txrate_selectmode(hw, tcb_desc);
                 _rtl_query_bandwidth_mode(hw, tcb_desc);
@@ -777,10 +777,10 @@ void rtl_watchdog_wq_callback(void *data)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        bool b_busytraffic = false;
-        bool b_higher_busytraffic = false;
-        bool b_higher_busyrxtraffic = false;
-        bool b_higher_busytxtraffic = false;
+        bool busytraffic = false;
+        bool higher_busytraffic = false;
+        bool higher_busyrxtraffic = false;
+        bool higher_busytxtraffic = false;
 
         u8 idx = 0;
         u32 rx_cnt_inp4eriod = 0;
@@ -788,7 +788,7 @@ void rtl_watchdog_wq_callback(void *data)
         u32 aver_rx_cnt_inperiod = 0;
         u32 aver_tx_cnt_inperiod = 0;
 
-        bool benter_ps = false;
+        bool enter_ps = false;
 
         if (is_hal_stop(rtlhal))
                 return;
@@ -832,29 +832,29 @@ void rtl_watchdog_wq_callback(void *data)
 
                 /* (2) check traffic busy */
                 if (aver_rx_cnt_inperiod > 100 || aver_tx_cnt_inperiod > 100)
-                        b_busytraffic = true;
+                        busytraffic = true;
 
                 /* Higher Tx/Rx data. */
                 if (aver_rx_cnt_inperiod > 4000 ||
                     aver_tx_cnt_inperiod > 4000) {
-                        b_higher_busytraffic = true;
+                        higher_busytraffic = true;
 
                         /* Extremely high Rx data. */
                         if (aver_rx_cnt_inperiod > 5000)
-                                b_higher_busyrxtraffic = true;
+                                higher_busyrxtraffic = true;
                         else
-                                b_higher_busytxtraffic = false;
+                                higher_busytxtraffic = false;
                 }
 
                 if (((rtlpriv->link_info.num_rx_inperiod +
                       rtlpriv->link_info.num_tx_inperiod) > 8) ||
                     (rtlpriv->link_info.num_rx_inperiod > 2))
-                        benter_ps = false;
+                        enter_ps = false;
                 else
-                        benter_ps = true;
+                        enter_ps = true;
 
                 /* LeisurePS only work in infra mode. */
-                if (benter_ps)
+                if (enter_ps)
                         rtl_lps_enter(hw);
                 else
                         rtl_lps_leave(hw);
@@ -863,9 +863,9 @@ void rtl_watchdog_wq_callback(void *data)
         rtlpriv->link_info.num_rx_inperiod = 0;
         rtlpriv->link_info.num_tx_inperiod = 0;
 
-        rtlpriv->link_info.b_busytraffic = b_busytraffic;
-        rtlpriv->link_info.b_higher_busytraffic = b_higher_busytraffic;
-        rtlpriv->link_info.b_higher_busyrxtraffic = b_higher_busyrxtraffic;
+        rtlpriv->link_info.busytraffic = busytraffic;
+        rtlpriv->link_info.higher_busytraffic = higher_busytraffic;
+        rtlpriv->link_info.higher_busyrxtraffic = higher_busyrxtraffic;
 
 }