Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0386f15 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: rtl8192de: rtl8192se: Fix handling for missing get_btc_status 



The recent changes in checking for Bluetooth status added some callbacks to code
in rtlwifi. To make certain that all callbacks are defined, a dummy routine has been
added to rtlwifi, and the drivers that need to use it are modified.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3a8fede1

drivers/net/wireless/rtlwifi/core.c

+6 −0
Original line number Diff line number Diff line
@@ -1828,3 +1828,9 @@ const struct ieee80211_ops rtl_ops = { 
	.flush = rtl_op_flush,

};

EXPORT_SYMBOL_GPL(rtl_ops);



bool rtl_btc_status_false(void)

{

	return false;

}

EXPORT_SYMBOL_GPL(rtl_btc_status_false);

drivers/net/wireless/rtlwifi/core.h

+1 −0
Original line number Diff line number Diff line
@@ -42,5 +42,6 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr, 
		     u32 mask, u32 data);

void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data);

bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb);

bool rtl_btc_status_false(void);



#endif

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { 
	.phy_lc_calibrate = _rtl92ce_phy_lc_calibrate,

	.phy_set_bw_mode_callback = rtl92ce_phy_set_bw_mode_callback,

	.dm_dynamic_txpower = rtl92ce_dm_dynamic_txpower,

	.get_btc_status = rtl_btc_status_false,

};



static struct rtl_mod_params rtl92ce_mod_params = {

drivers/net/wireless/rtlwifi/rtl8192de/sw.c

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static struct rtl_hal_ops rtl8192de_hal_ops = { 
	.get_rfreg = rtl92d_phy_query_rf_reg,

	.set_rfreg = rtl92d_phy_set_rf_reg,

	.linked_set_reg = rtl92d_linked_set_reg,

	.get_btc_status = rtl_btc_status_false,

};



static struct rtl_mod_params rtl92de_mod_params = {

drivers/net/wireless/rtlwifi/rtl8192se/sw.c

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static struct rtl_hal_ops rtl8192se_hal_ops = { 
	.set_bbreg = rtl92s_phy_set_bb_reg,

	.get_rfreg = rtl92s_phy_query_rf_reg,

	.set_rfreg = rtl92s_phy_set_rf_reg,

	.get_btc_status = rtl_btc_status_false,

};



static struct rtl_mod_params rtl92se_mod_params = {