diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/ps.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index de7f05f848ef..50504942ded1 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -759,7 +759,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, | |||
759 | unsigned int len) | 759 | unsigned int len) |
760 | { | 760 | { |
761 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 761 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
762 | struct ieee80211_mgmt *mgmt = (void *)data; | 762 | struct ieee80211_mgmt *mgmt = data; |
763 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); | 763 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); |
764 | u8 *pos, *end, *ie; | 764 | u8 *pos, *end, *ie; |
765 | u16 noa_len; | 765 | u16 noa_len; |
@@ -858,7 +858,7 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, | |||
858 | unsigned int len) | 858 | unsigned int len) |
859 | { | 859 | { |
860 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 860 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
861 | struct ieee80211_mgmt *mgmt = (void *)data; | 861 | struct ieee80211_mgmt *mgmt = data; |
862 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); | 862 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); |
863 | u8 noa_num, index, i, noa_index = 0; | 863 | u8 noa_num, index, i, noa_index = 0; |
864 | u8 *pos, *end, *ie; | 864 | u8 *pos, *end, *ie; |
@@ -950,9 +950,8 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
950 | switch (p2p_ps_state) { | 950 | switch (p2p_ps_state) { |
951 | case P2P_PS_DISABLE: | 951 | case P2P_PS_DISABLE: |
952 | p2pinfo->p2p_ps_state = p2p_ps_state; | 952 | p2pinfo->p2p_ps_state = p2p_ps_state; |
953 | rtlpriv->cfg->ops->set_hw_reg(hw, | 953 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
954 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 954 | &p2p_ps_state); |
955 | (u8 *)(&p2p_ps_state)); | ||
956 | 955 | ||
957 | p2pinfo->noa_index = 0; | 956 | p2pinfo->noa_index = 0; |
958 | p2pinfo->ctwindow = 0; | 957 | p2pinfo->ctwindow = 0; |
@@ -964,7 +963,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
964 | rtlps->smart_ps = 2; | 963 | rtlps->smart_ps = 2; |
965 | rtlpriv->cfg->ops->set_hw_reg(hw, | 964 | rtlpriv->cfg->ops->set_hw_reg(hw, |
966 | HW_VAR_H2C_FW_PWRMODE, | 965 | HW_VAR_H2C_FW_PWRMODE, |
967 | (u8 *)(&rtlps->pwr_mode)); | 966 | &rtlps->pwr_mode); |
968 | } | 967 | } |
969 | } | 968 | } |
970 | break; | 969 | break; |
@@ -977,12 +976,12 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
977 | rtlps->smart_ps = 0; | 976 | rtlps->smart_ps = 0; |
978 | rtlpriv->cfg->ops->set_hw_reg(hw, | 977 | rtlpriv->cfg->ops->set_hw_reg(hw, |
979 | HW_VAR_H2C_FW_PWRMODE, | 978 | HW_VAR_H2C_FW_PWRMODE, |
980 | (u8 *)(&rtlps->pwr_mode)); | 979 | &rtlps->pwr_mode); |
981 | } | 980 | } |
982 | } | 981 | } |
983 | rtlpriv->cfg->ops->set_hw_reg(hw, | 982 | rtlpriv->cfg->ops->set_hw_reg(hw, |
984 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 983 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
985 | (u8 *)(&p2p_ps_state)); | 984 | &p2p_ps_state); |
986 | } | 985 | } |
987 | break; | 986 | break; |
988 | case P2P_PS_SCAN: | 987 | case P2P_PS_SCAN: |
@@ -992,7 +991,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
992 | p2pinfo->p2p_ps_state = p2p_ps_state; | 991 | p2pinfo->p2p_ps_state = p2p_ps_state; |
993 | rtlpriv->cfg->ops->set_hw_reg(hw, | 992 | rtlpriv->cfg->ops->set_hw_reg(hw, |
994 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 993 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
995 | (u8 *)(&p2p_ps_state)); | 994 | &p2p_ps_state); |
996 | } | 995 | } |
997 | break; | 996 | break; |
998 | default: | 997 | default: |
@@ -1012,7 +1011,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) | |||
1012 | { | 1011 | { |
1013 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1012 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1014 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 1013 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
1015 | struct ieee80211_hdr *hdr = (void *)data; | 1014 | struct ieee80211_hdr *hdr = data; |
1016 | 1015 | ||
1017 | if (!mac->p2p) | 1016 | if (!mac->p2p) |
1018 | return; | 1017 | return; |