LinuxLists.cc - [PATCH] rtl8192c: fix compilation errors

2011-02-24 19:37:15

Subject: [PATCH] rtl8192c: fix compilation errors

2011-02-24 19:58:24

Subject: Re: [PATCH v2] rtl8192c: fix compilation errors

On 02/24/2011 01:39 PM, Johannes Berg wrote:
> From: Johannes Berg<[email protected]>
>
> 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<[email protected]>
> ---

ACK.

Your V2 is better than the one I submitted last night as I missed the change in
the header file.

Why does the PowerPC compiler flag this when the X86_64 one does not?

Larry

> 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,
>
>
>

2011-02-24 20:02:07

by Johannes Berg

[permalink] [raw]

Subject: Re: [PATCH v2] rtl8192c: fix compilation errors

On Thu, 2011-02-24 at 13:57 -0600, Larry Finger wrote:

> Your V2 is better than the one I submitted last night as I missed the change in
> the header file.

Oh I missed yours, but without changing the header file it still fails
to compile so ...

> Why does the PowerPC compiler flag this when the X86_64 one does not?

I have no idea, something about the section layout maybe.

johannes

2011-02-24 19:39:09

by Johannes Berg

[permalink] [raw]

Subject: [PATCH v2] rtl8192c: fix compilation errors

From: Johannes Berg <[email protected]>

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 <[email protected]>
---
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,