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

Commit 41cae2d0 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

rtl8192c: fix compilation errors 



On my G5 this fails to compile with

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict

since you can't export static functions.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1472d3a8

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -644,7 +644,7 @@ void rtl92c_phy_set_beacon_hw_reg(struct ieee80211_hw *hw, u16 beaconinterval) 
}

}

EXPORT_SYMBOL(rtl92c_phy_set_beacon_hw_reg);

EXPORT_SYMBOL(rtl92c_phy_set_beacon_hw_reg);





static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,

u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,

				enum wireless_mode wirelessmode,

				enum wireless_mode wirelessmode,

				long power_indbm)

				long power_indbm)

{

{
@@ -676,7 +676,7 @@ static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, 
}

}

EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx);

EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx);





static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

				  enum wireless_mode wirelessmode,

				  enum wireless_mode wirelessmode,

				  u8 txpwridx)

				  u8 txpwridx)

{

{

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -228,10 +228,10 @@ void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); 
void rtl92c_phy_set_io(struct ieee80211_hw *hw);

void rtl92c_phy_set_io(struct ieee80211_hw *hw);

void rtl92c_bb_block_on(struct ieee80211_hw *hw);

void rtl92c_bb_block_on(struct ieee80211_hw *hw);

u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask);

u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask);

static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

				  enum wireless_mode wirelessmode,

				  enum wireless_mode wirelessmode,

				  u8 txpwridx);

				  u8 txpwridx);

static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,

u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,

				enum wireless_mode wirelessmode,

				enum wireless_mode wirelessmode,

				long power_indbm);

				long power_indbm);

void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);

void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);