* [PATCH wireless-2.6.40] iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
@ 2011-05-20 18:56 Wey-Yi Guy
2011-05-20 20:49 ` Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Wey-Yi Guy @ 2011-05-20 18:56 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, ipw3945-devel, randy.dunlap, Wey-Yi Guy
Fix compiling error when CONFIG_MAC80211_DEBUGFS is not enabled
drivers/net/wireless/iwlwifi/iwl-agn-rs.c:351: error: 'struct iwl_lq_sta' has no member named 'dbg_fixed_rate'
drivers/net/wireless/iwlwifi/iwl-agn-rs.c:1076: error: 'struct iwl_lq_sta' has no member named 'dbg_fixed_rate'
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
these patches are also available from wireless-2.6 branch on
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index f95c0a4..2f661df 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -334,7 +334,7 @@ static u8 rs_tl_add_packet(struct iwl_lq_sta *lq_data,
return tid;
}
-#if defined(CONFIG_MAC80211_DEBUGFS) || defined(CONFIG_IWLWIFI_DEVICE_SVTOOL)
+#ifdef CONFIG_MAC80211_DEBUGFS
static void rs_program_fix_rate(struct iwl_priv *priv,
struct iwl_lq_sta *lq_sta)
{
@@ -1071,7 +1071,7 @@ done:
/* See if there's a better rate or modulation mode to try. */
if (sta && sta->supp_rates[sband->band])
rs_rate_scale_perform(priv, skb, sta, lq_sta);
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_MAC80211_DEBUGFS
if (priv->dbg_fixed_rate != lq_sta->dbg_fixed_rate)
rs_program_fix_rate(priv, lq_sta);
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH wireless-2.6.40] iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
2011-05-20 18:56 [PATCH wireless-2.6.40] iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled Wey-Yi Guy
@ 2011-05-20 20:49 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2011-05-20 20:49 UTC (permalink / raw)
To: Wey-Yi Guy; +Cc: linville, linux-wireless, ipw3945-devel
On 05/20/11 11:56, Wey-Yi Guy wrote:
> Fix compiling error when CONFIG_MAC80211_DEBUGFS is not enabled
> drivers/net/wireless/iwlwifi/iwl-agn-rs.c:351: error: 'struct iwl_lq_sta' has no member named 'dbg_fixed_rate'
> drivers/net/wireless/iwlwifi/iwl-agn-rs.c:1076: error: 'struct iwl_lq_sta' has no member named 'dbg_fixed_rate'
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks.
> ---
> these patches are also available from wireless-2.6 branch on
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
>
> drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> index f95c0a4..2f661df 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> @@ -334,7 +334,7 @@ static u8 rs_tl_add_packet(struct iwl_lq_sta *lq_data,
> return tid;
> }
>
> -#if defined(CONFIG_MAC80211_DEBUGFS) || defined(CONFIG_IWLWIFI_DEVICE_SVTOOL)
> +#ifdef CONFIG_MAC80211_DEBUGFS
> static void rs_program_fix_rate(struct iwl_priv *priv,
> struct iwl_lq_sta *lq_sta)
> {
> @@ -1071,7 +1071,7 @@ done:
> /* See if there's a better rate or modulation mode to try. */
> if (sta && sta->supp_rates[sband->band])
> rs_rate_scale_perform(priv, skb, sta, lq_sta);
> -#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
> +#ifdef CONFIG_MAC80211_DEBUGFS
> if (priv->dbg_fixed_rate != lq_sta->dbg_fixed_rate)
> rs_program_fix_rate(priv, lq_sta);
> #endif
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-20 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 18:56 [PATCH wireless-2.6.40] iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled Wey-Yi Guy
2011-05-20 20:49 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).