Return-path: Received: from he.sipsolutions.net ([78.46.109.217]:41113 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755402Ab1BXTjJ (ORCPT ); Thu, 24 Feb 2011 14:39:09 -0500 Subject: [PATCH v2] rtl8192c: fix compilation errors From: Johannes Berg To: "John W. Linville" Cc: Larry Finger , linux-wireless In-Reply-To: <1298576230.4251.5.camel@jlt3.sipsolutions.net> References: <1298576230.4251.5.camel@jlt3.sipsolutions.net> Content-Type: text/plain; charset="UTF-8" Date: Thu, 24 Feb 2011 20:39:05 +0100 Message-ID: <1298576345.4251.6.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Johannes Berg 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: Johannes Berg --- drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 12 ++++++------ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) --- wireless-testing.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-02-24 20:35:47.398280074 +0100 +++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-02-24 20:35:58.536168754 +0100 @@ -644,9 +644,9 @@ void rtl92c_phy_set_beacon_hw_reg(struct } EXPORT_SYMBOL(rtl92c_phy_set_beacon_hw_reg); -static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, - enum wireless_mode wirelessmode, - long power_indbm) +u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, + enum wireless_mode wirelessmode, + long power_indbm) { u8 txpwridx; long offset; @@ -676,9 +676,9 @@ static u8 _rtl92c_phy_dbm_to_txpwr_Idx(s } EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx); -static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, - enum wireless_mode wirelessmode, - u8 txpwridx) +long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, + enum wireless_mode wirelessmode, + u8 txpwridx) { long offset; long pwrout_dbm; --- wireless-testing.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h 2011-02-24 20:37:58.401971070 +0100 +++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h 2011-02-24 20:38:15.513800156 +0100 @@ -228,12 +228,12 @@ void rtl92ce_phy_set_rf_on(struct ieee80 void rtl92c_phy_set_io(struct ieee80211_hw *hw); void rtl92c_bb_block_on(struct ieee80211_hw *hw); u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask); -static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, - enum wireless_mode wirelessmode, - u8 txpwridx); -static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, - enum wireless_mode wirelessmode, - long power_indbm); +long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, + enum wireless_mode wirelessmode, + u8 txpwridx); +u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, + enum wireless_mode wirelessmode, + long power_indbm); void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw); static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable, u32 cmdtableidx, u32 cmdtablesz,