Skip to content

L
linux
Commit 83dc3638 authored by Peter Wu's avatar Peter Wu Committed by John W. Linville
Browse files
Options

rtlwifi: remove unused allow_all_destaddr functions 

Unused as configure_filter takes care of setting/clearing RCR_AAP.

In commit "rtlwifi: rtl8723be: rtl8723com: Remove unused
allow_all_destaddr functions", Larry Finger removed allow_all_destaddr
from the struct. This commit removes the related function too.
Signed-off-by: default avatarPeter Wu <peter@lekensteyn.nl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f8b8a47e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 118 deletions
drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
View file @ 83dc3638
...@@ -2515,23 +2515,3 @@ void rtl88ee_suspend(struct ieee80211_hw *hw) ...@@ -2515,23 +2515,3 @@ void rtl88ee_suspend(struct ieee80211_hw *hw)
void rtl88ee_resume(struct ieee80211_hw *hw) void rtl88ee_resume(struct ieee80211_hw *hw)
{ {
} }
/* Turn on AAP (RCR:bit 0) for promicuous mode. */
void rtl88ee_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
if (allow_all_da) /* Set BIT0 */
rtlpci->receive_config |= RCR_AAP;
else /* Clear BIT0 */
rtlpci->receive_config &= ~RCR_AAP;
if (write_into_reg)
rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
"receive_config = 0x%08X, write_into_reg =%d\n",
rtlpci->receive_config, write_into_reg);
}
drivers/net/wireless/rtlwifi/rtl8188ee/hw.h
View file @ 83dc3638
...@@ -61,8 +61,6 @@ void rtl8188ee_bt_reg_init(struct ieee80211_hw *hw); ...@@ -61,8 +61,6 @@ void rtl8188ee_bt_reg_init(struct ieee80211_hw *hw);
void rtl8188ee_bt_hw_init(struct ieee80211_hw *hw); void rtl8188ee_bt_hw_init(struct ieee80211_hw *hw);
void rtl88ee_suspend(struct ieee80211_hw *hw); void rtl88ee_suspend(struct ieee80211_hw *hw);
void rtl88ee_resume(struct ieee80211_hw *hw); void rtl88ee_resume(struct ieee80211_hw *hw);
void rtl88ee_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg);
void rtl88ee_fw_clk_off_timer_callback(unsigned long data); void rtl88ee_fw_clk_off_timer_callback(unsigned long data);
#endif #endif
drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
View file @ 83dc3638
...@@ -255,7 +255,6 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = { ...@@ -255,7 +255,6 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = {
.enable_hw_sec = rtl88ee_enable_hw_security_config, .enable_hw_sec = rtl88ee_enable_hw_security_config,
.set_key = rtl88ee_set_key, .set_key = rtl88ee_set_key,
.init_sw_leds = rtl88ee_init_sw_leds, .init_sw_leds = rtl88ee_init_sw_leds,
.allow_all_destaddr = rtl88ee_allow_all_destaddr,
.get_bbreg = rtl88e_phy_query_bb_reg, .get_bbreg = rtl88e_phy_query_bb_reg,
.set_bbreg = rtl88e_phy_set_bb_reg, .set_bbreg = rtl88e_phy_set_bb_reg,
.get_rfreg = rtl88e_phy_query_rf_reg, .get_rfreg = rtl88e_phy_query_rf_reg,
......
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
View file @ 83dc3638
...@@ -2423,24 +2423,3 @@ void rtl92ce_suspend(struct ieee80211_hw *hw) ...@@ -2423,24 +2423,3 @@ void rtl92ce_suspend(struct ieee80211_hw *hw)
void rtl92ce_resume(struct ieee80211_hw *hw) void rtl92ce_resume(struct ieee80211_hw *hw)
{ {
} }
/* Turn on AAP (RCR:bit 0) for promicuous mode. */
void rtl92ce_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
if (allow_all_da) {/* Set BIT0 */
rtlpci->receive_config |= RCR_AAP;
} else {/* Clear BIT0 */
rtlpci->receive_config &= ~RCR_AAP;
}
if (write_into_reg)
rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
"receive_config=0x%08X, write_into_reg=%d\n",
rtlpci->receive_config, write_into_reg);
}
drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
View file @ 83dc3638
...@@ -76,7 +76,5 @@ void rtl8192ce_bt_reg_init(struct ieee80211_hw *hw); ...@@ -76,7 +76,5 @@ void rtl8192ce_bt_reg_init(struct ieee80211_hw *hw);
void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw); void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw);
void rtl92ce_suspend(struct ieee80211_hw *hw); void rtl92ce_suspend(struct ieee80211_hw *hw);
void rtl92ce_resume(struct ieee80211_hw *hw); void rtl92ce_resume(struct ieee80211_hw *hw);
void rtl92ce_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg);
#endif #endif
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
View file @ 83dc3638
...@@ -229,7 +229,6 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { ...@@ -229,7 +229,6 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = {
.enable_hw_sec = rtl92ce_enable_hw_security_config, .enable_hw_sec = rtl92ce_enable_hw_security_config,
.set_key = rtl92ce_set_key, .set_key = rtl92ce_set_key,
.init_sw_leds = rtl92ce_init_sw_leds, .init_sw_leds = rtl92ce_init_sw_leds,
.allow_all_destaddr = rtl92ce_allow_all_destaddr,
.get_bbreg = rtl92c_phy_query_bb_reg, .get_bbreg = rtl92c_phy_query_bb_reg,
.set_bbreg = rtl92c_phy_set_bb_reg, .set_bbreg = rtl92c_phy_set_bb_reg,
.set_rfreg = rtl92ce_phy_set_rf_reg, .set_rfreg = rtl92ce_phy_set_rf_reg,
......
drivers/net/wireless/rtlwifi/rtl8192se/hw.c
View file @ 83dc3638
...@@ -2544,23 +2544,3 @@ void rtl92se_resume(struct ieee80211_hw *hw) ...@@ -2544,23 +2544,3 @@ void rtl92se_resume(struct ieee80211_hw *hw)
pci_write_config_dword(rtlpci->pdev, 0x40, pci_write_config_dword(rtlpci->pdev, 0x40,
val & 0xffff00ff); val & 0xffff00ff);
} }
/* Turn on AAP (RCR:bit 0) for promicuous mode. */
void rtl92se_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
if (allow_all_da) /* Set BIT0 */
rtlpci->receive_config |= RCR_AAP;
else /* Clear BIT0 */
rtlpci->receive_config &= ~RCR_AAP;
if (write_into_reg)
rtl_write_dword(rtlpriv, RCR, rtlpci->receive_config);
RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
"receive_config=0x%08X, write_into_reg=%d\n",
rtlpci->receive_config, write_into_reg);
}
drivers/net/wireless/rtlwifi/rtl8192se/hw.h
View file @ 83dc3638
...@@ -74,7 +74,5 @@ void rtl92se_set_key(struct ieee80211_hw *hw, ...@@ -74,7 +74,5 @@ void rtl92se_set_key(struct ieee80211_hw *hw,
u8 enc_algo, bool is_wepkey, bool clear_all); u8 enc_algo, bool is_wepkey, bool clear_all);
void rtl92se_suspend(struct ieee80211_hw *hw); void rtl92se_suspend(struct ieee80211_hw *hw);
void rtl92se_resume(struct ieee80211_hw *hw); void rtl92se_resume(struct ieee80211_hw *hw);
void rtl92se_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg);
#endif #endif
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
View file @ 83dc3638
...@@ -290,7 +290,6 @@ static struct rtl_hal_ops rtl8192se_hal_ops = { ...@@ -290,7 +290,6 @@ static struct rtl_hal_ops rtl8192se_hal_ops = {
.enable_hw_sec = rtl92se_enable_hw_security_config, .enable_hw_sec = rtl92se_enable_hw_security_config,
.set_key = rtl92se_set_key, .set_key = rtl92se_set_key,
.init_sw_leds = rtl92se_init_sw_leds, .init_sw_leds = rtl92se_init_sw_leds,
.allow_all_destaddr = rtl92se_allow_all_destaddr,
.get_bbreg = rtl92s_phy_query_bb_reg, .get_bbreg = rtl92s_phy_query_bb_reg,
.set_bbreg = rtl92s_phy_set_bb_reg, .set_bbreg = rtl92s_phy_set_bb_reg,
.get_rfreg = rtl92s_phy_query_rf_reg, .get_rfreg = rtl92s_phy_query_rf_reg,
......
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
View file @ 83dc3638
...@@ -2383,24 +2383,3 @@ void rtl8723ae_suspend(struct ieee80211_hw *hw) ...@@ -2383,24 +2383,3 @@ void rtl8723ae_suspend(struct ieee80211_hw *hw)
void rtl8723ae_resume(struct ieee80211_hw *hw) void rtl8723ae_resume(struct ieee80211_hw *hw)
{ {
} }
/* Turn on AAP (RCR:bit 0) for promicuous mode. */
void rtl8723ae_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
if (allow_all_da) /* Set BIT0 */
rtlpci->receive_config |= RCR_AAP;
else /* Clear BIT0 */
rtlpci->receive_config &= ~RCR_AAP;
if (write_into_reg)
rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
"receive_config=0x%08X, write_into_reg=%d\n",
rtlpci->receive_config, write_into_reg);
}
drivers/net/wireless/rtlwifi/rtl8723ae/hw.h
View file @ 83dc3638
...@@ -67,7 +67,5 @@ void rtl8723ae_bt_reg_init(struct ieee80211_hw *hw); ...@@ -67,7 +67,5 @@ void rtl8723ae_bt_reg_init(struct ieee80211_hw *hw);
void rtl8723ae_bt_hw_init(struct ieee80211_hw *hw); void rtl8723ae_bt_hw_init(struct ieee80211_hw *hw);
void rtl8723ae_suspend(struct ieee80211_hw *hw); void rtl8723ae_suspend(struct ieee80211_hw *hw);
void rtl8723ae_resume(struct ieee80211_hw *hw); void rtl8723ae_resume(struct ieee80211_hw *hw);
void rtl8723ae_allow_all_destaddr(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg);
#endif #endif
drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
View file @ 83dc3638
...@@ -238,7 +238,6 @@ static struct rtl_hal_ops rtl8723ae_hal_ops = { ...@@ -238,7 +238,6 @@ static struct rtl_hal_ops rtl8723ae_hal_ops = {
.enable_hw_sec = rtl8723ae_enable_hw_security_config, .enable_hw_sec = rtl8723ae_enable_hw_security_config,
.set_key = rtl8723ae_set_key, .set_key = rtl8723ae_set_key,
.init_sw_leds = rtl8723ae_init_sw_leds, .init_sw_leds = rtl8723ae_init_sw_leds,
.allow_all_destaddr = rtl8723ae_allow_all_destaddr,
.get_bbreg = rtl8723_phy_query_bb_reg, .get_bbreg = rtl8723_phy_query_bb_reg,
.set_bbreg = rtl8723_phy_set_bb_reg, .set_bbreg = rtl8723_phy_set_bb_reg,
.get_rfreg = rtl8723ae_phy_query_rf_reg, .get_rfreg = rtl8723ae_phy_query_rf_reg,
......
drivers/net/wireless/rtlwifi/rtl8723be/hw.c
View file @ 83dc3638
...@@ -2501,23 +2501,3 @@ void rtl8723be_suspend(struct ieee80211_hw *hw) ...@@ -2501,23 +2501,3 @@ void rtl8723be_suspend(struct ieee80211_hw *hw)
void rtl8723be_resume(struct ieee80211_hw *hw) void rtl8723be_resume(struct ieee80211_hw *hw)
{ {
} }
/* Turn on AAP (RCR:bit 0) for promicuous mode. */
void rtl8723be_allow_all_destaddr(struct ieee80211_hw *hw, bool allow_all_da,
bool write_into_reg)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
if (allow_all_da) /* Set BIT0 */
rtlpci->receive_config |= RCR_AAP;
else /* Clear BIT0 */
rtlpci->receive_config &= ~RCR_AAP;
if (write_into_reg)
rtl_write_dword(rtlpriv, REG_RCR, rtlpci->receive_config);
RT_TRACE(rtlpriv, COMP_TURBO | COMP_INIT, DBG_LOUD,
"receive_config = 0x%08X, write_into_reg =%d\n",
rtlpci->receive_config, write_into_reg);
}
drivers/net/wireless/rtlwifi/rtl8723be/hw.h
View file @ 83dc3638
...@@ -59,6 +59,4 @@ void rtl8723be_bt_reg_init(struct ieee80211_hw *hw); ...@@ -59,6 +59,4 @@ void rtl8723be_bt_reg_init(struct ieee80211_hw *hw);
void rtl8723be_bt_hw_init(struct ieee80211_hw *hw); void rtl8723be_bt_hw_init(struct ieee80211_hw *hw);
void rtl8723be_suspend(struct ieee80211_hw *hw); void rtl8723be_suspend(struct ieee80211_hw *hw);
void rtl8723be_resume(struct ieee80211_hw *hw); void rtl8723be_resume(struct ieee80211_hw *hw);
void rtl8723be_allow_all_destaddr(struct ieee80211_hw *hw, bool allow_all_da,
bool write_into_reg);
#endif #endif
drivers/net/wireless/rtlwifi/wifi.h
View file @ 83dc3638
...@@ -1960,8 +1960,6 @@ struct rtl_hal_ops { ...@@ -1960,8 +1960,6 @@ struct rtl_hal_ops {
u32 regaddr, u32 bitmask); u32 regaddr, u32 bitmask);
void (*set_rfreg) (struct ieee80211_hw *hw, enum radio_path rfpath, void (*set_rfreg) (struct ieee80211_hw *hw, enum radio_path rfpath,
u32 regaddr, u32 bitmask, u32 data); u32 regaddr, u32 bitmask, u32 data);
void (*allow_all_destaddr)(struct ieee80211_hw *hw,
bool allow_all_da, bool write_into_reg);
void (*linked_set_reg) (struct ieee80211_hw *hw); void (*linked_set_reg) (struct ieee80211_hw *hw);
void (*chk_switch_dmdp) (struct ieee80211_hw *hw); void (*chk_switch_dmdp) (struct ieee80211_hw *hw);
void (*dualmac_easy_concurrent) (struct ieee80211_hw *hw); void (*dualmac_easy_concurrent) (struct ieee80211_hw *hw);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7