rtlwifi: Update power-save routines for 062814 driver

Realtek released a new version of the drivers on 06/28/2014. This
patch implements the new power-save code. These changes also force
corresponding changes in the drivers.

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

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
index 3cd286930fe0..1b939183f39d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
@@ -39,6 +39,7 @@
 #include "../rtl8723com/fw_common.h"
 #include "led.h"
 #include "hw.h"
+#include "pwrseqcmd.h"
 #include "pwrseq.h"
 #include "../btcoexist/rtl_btc.h"
 
@@ -814,9 +815,9 @@ static bool _rtl8723be_init_mac(struct ieee80211_hw *hw)
                 mac_func_enable = false;
 
         /* HW Power on sequence */
-        if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
-                                      PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
-                                      RTL8723_NIC_ENABLE_FLOW)) {
+        if (!rtlbe_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,
+                                        PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,
+                                        RTL8723_NIC_ENABLE_FLOW)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "init MAC Fail as power on failure\n");
                 return false;
@@ -1305,8 +1306,8 @@ static void _rtl8723be_poweroff_adapter(struct ieee80211_hw *hw)
 
         /* Combo (PCIe + USB) Card and PCIe-MF Card */
         /* 1. Run LPS WL RFOFF flow */
-        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                 PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
+        rtlbe_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                   PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
 
         /* 2. 0x1F[7:0] = 0 */
         /* turn off RF */
@@ -1324,8 +1325,8 @@ static void _rtl8723be_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
 
         /* HW card disable configuration. */
-        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                 PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
+        rtlbe_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
+                                   PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
 
         /* Reset MCU IO Wrapper */
         u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);