2008-06-09 08:56:55

by Andrew Morton

[permalink] [raw]
Subject: CONFIG_IWL4965_HT=n in linux-next

drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_siso_to_other':
drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1439: error: 'struct iwl_priv' has no member named 'current_ht_config'
drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1443: error: 'struct iwl_priv' has no member named 'current_ht_config'
drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_mimo_to_other':
drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1530: error: 'struct iwl_priv' has no member named 'current_ht_config'
drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1534: error: 'struct iwl_priv' has no member named 'current_ht_config'


2008-06-09 09:20:15

by Tomas Winkler

[permalink] [raw]
Subject: Re: CONFIG_IWL4965_HT=n in linux-next

On Mon, Jun 9, 2008 at 11:56 AM, Andrew Morton
<[email protected]> wrote:
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_siso_to_other':
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1439: error: 'struct iwl_priv' has no member named 'current_ht_config'
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1443: error: 'struct iwl_priv' has no member named 'current_ht_config'
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_mimo_to_other':
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1530: error: 'struct iwl_priv' has no member named 'current_ht_config'
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1534: error: 'struct iwl_priv' has no member named 'current_ht_config'

It's a known issue. we are about to remove this conditional. Will
happen till EOW.
Tomas

2008-06-09 10:09:31

by Tomas Winkler

[permalink] [raw]
Subject: Re: CONFIG_IWL4965_HT=n in linux-next

On Mon, Jun 9, 2008 at 12:23 PM, Andrew Morton
<[email protected]> wrote:
> On Mon, 9 Jun 2008 12:20:14 +0300 "Tomas Winkler" <[email protected]> wrote:
>
>> On Mon, Jun 9, 2008 at 11:56 AM, Andrew Morton
>> <[email protected]> wrote:
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_siso_to_other':
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1439: error: 'struct iwl_priv' has no member named 'current_ht_config'
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1443: error: 'struct iwl_priv' has no member named 'current_ht_config'
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_mimo_to_other':
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1530: error: 'struct iwl_priv' has no member named 'current_ht_config'
>> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1534: error: 'struct iwl_priv' has no member named 'current_ht_config'
>>
>> It's a known issue.
>
> Sob. Well please fix it urgently! Poeple are trying to get work done
> on top of linux-next.
>
I thought his is a development branch, everybody is on the edge today :)

>> we are about to remove this conditional. Will
>> happen till EOW.
>
>
> I hacked around it:
Why is not good just make it HT=y. Or you need it fixed for this
random config files regression tests
Anyway, if it's so urgent it will be done till EOD (TMZ:GMT+2), hope
it's good enough,
Tomas

>
> From: Andrew Morton <[email protected]>
>
> Cc: "John W. Linville" <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> ---
>
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff -puN drivers/net/wireless/iwlwifi/iwl-4965-rs.c~drivers-net-wireless-iwlwifi-iwl-4965-rsc-config_iwl4965_ht=n-hack drivers/net/wireless/iwlwifi/iwl-4965-rs.c
> --- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c~drivers-net-wireless-iwlwifi-iwl-4965-rsc-config_iwl4965_ht=n-hack
> +++ a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
> @@ -1435,6 +1435,7 @@ static int rs_move_siso_to_other(struct
> }
> break;
> case IWL_SISO_SWITCH_GI:
> +#ifdef CONFIG_IWL4965_HT
> if (!tbl->is_fat &&
> !(priv->current_ht_config.sgf &
> HT_SHORT_GI_20MHZ))
> @@ -1443,7 +1444,7 @@ static int rs_move_siso_to_other(struct
> !(priv->current_ht_config.sgf &
> HT_SHORT_GI_40MHZ))
> break;
> -
> +#endif
> IWL_DEBUG_RATE("LQ: SISO toggle SGI/NGI\n");
>
> memcpy(search_tbl, tbl, sz);
> @@ -1526,6 +1527,7 @@ static int rs_move_mimo_to_other(struct
> break;
>
> case IWL_MIMO_SWITCH_GI:
> +#ifdef CONFIG_IWL4965_HT
> if (!tbl->is_fat &&
> !(priv->current_ht_config.sgf &
> HT_SHORT_GI_20MHZ))
> @@ -1533,6 +1535,7 @@ static int rs_move_mimo_to_other(struct
> if (tbl->is_fat &&
> !(priv->current_ht_config.sgf &
> HT_SHORT_GI_40MHZ))
> +#endif
> break;
>
> IWL_DEBUG_RATE("LQ: MIMO toggle SGI/NGI\n");
> _
>
>

2008-06-09 09:23:44

by Andrew Morton

[permalink] [raw]
Subject: Re: CONFIG_IWL4965_HT=n in linux-next

On Mon, 9 Jun 2008 12:20:14 +0300 "Tomas Winkler" <[email protected]> wrote:

> On Mon, Jun 9, 2008 at 11:56 AM, Andrew Morton
> <[email protected]> wrote:
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_siso_to_other':
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1439: error: 'struct iwl_priv' has no member named 'current_ht_config'
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1443: error: 'struct iwl_priv' has no member named 'current_ht_config'
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_mimo_to_other':
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1530: error: 'struct iwl_priv' has no member named 'current_ht_config'
> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1534: error: 'struct iwl_priv' has no member named 'current_ht_config'
>
> It's a known issue.

Sob. Well please fix it urgently! Poeple are trying to get work done
on top of linux-next.

> we are about to remove this conditional. Will
> happen till EOW.


I hacked around it:


From: Andrew Morton <[email protected]>

Cc: "John W. Linville" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff -puN drivers/net/wireless/iwlwifi/iwl-4965-rs.c~drivers-net-wireless-iwlwifi-iwl-4965-rsc-config_iwl4965_ht=n-hack drivers/net/wireless/iwlwifi/iwl-4965-rs.c
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c~drivers-net-wireless-iwlwifi-iwl-4965-rsc-config_iwl4965_ht=n-hack
+++ a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -1435,6 +1435,7 @@ static int rs_move_siso_to_other(struct
}
break;
case IWL_SISO_SWITCH_GI:
+#ifdef CONFIG_IWL4965_HT
if (!tbl->is_fat &&
!(priv->current_ht_config.sgf &
HT_SHORT_GI_20MHZ))
@@ -1443,7 +1444,7 @@ static int rs_move_siso_to_other(struct
!(priv->current_ht_config.sgf &
HT_SHORT_GI_40MHZ))
break;
-
+#endif
IWL_DEBUG_RATE("LQ: SISO toggle SGI/NGI\n");

memcpy(search_tbl, tbl, sz);
@@ -1526,6 +1527,7 @@ static int rs_move_mimo_to_other(struct
break;

case IWL_MIMO_SWITCH_GI:
+#ifdef CONFIG_IWL4965_HT
if (!tbl->is_fat &&
!(priv->current_ht_config.sgf &
HT_SHORT_GI_20MHZ))
@@ -1533,6 +1535,7 @@ static int rs_move_mimo_to_other(struct
if (tbl->is_fat &&
!(priv->current_ht_config.sgf &
HT_SHORT_GI_40MHZ))
+#endif
break;

IWL_DEBUG_RATE("LQ: MIMO toggle SGI/NGI\n");
_


2008-06-09 20:00:08

by Ron Rindjunsky

[permalink] [raw]
Subject: Re: CONFIG_IWL4965_HT=n in linux-next

> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_siso_to_other':
> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1439: error: 'struct iwl_priv' has no member named 'current_ht_config'
> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1443: error: 'struct iwl_priv' has no member named 'current_ht_config'
> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c: In function 'rs_move_mimo_to_other':
> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1530: error: 'struct iwl_priv' has no member named 'current_ht_config'
> >> > drivers/net/wireless/iwlwifi/iwl-4965-rs.c:1534: error: 'struct iwl_priv' has no member named 'current_ht_config'
> >>
> >> It's a known issue.
> >
> > Sob. Well please fix it urgently! Poeple are trying to get work done
> > on top of linux-next.
> >
> I thought his is a development branch, everybody is on the edge today :)
>
> >> we are about to remove this conditional. Will
> >> happen till EOW.
> >
> >
> > I hacked around it:
> Why is not good just make it HT=y. Or you need it fixed for this
> random config files regression tests
> Anyway, if it's so urgent it will be done till EOD (TMZ:GMT+2), hope
> it's good enough,
> Tomas
>

a patch removing this config has been issued (iwlwifi: removing
IWL4965_HT config)
Ron