Latest iwlwifi in wireless-testing removed CONFIG_IWL4965_HT and
introduced CONFIG_IWL5000 for Intel Wireless WiFi 5000AGN support
which is built in IWL4965 module. This patch also enables IWLWIFI_LEDS,
IWLWIFI_RFKILL,IWL3945_LEDS IWLWIFI_DEBUG for iwlwifi build by default.
Signed-off-by: Zhao Yingying <[email protected]>
---
config.mk | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/config.mk b/config.mk
index b1fb68e..cafadfa 100644
--- a/config.mk
+++ b/config.mk
@@ -15,6 +15,7 @@ endif
# Wireless subsystem stuff
CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
# Enable QOS for 2.6.22, we'll do some hacks here to enable it.
# You will need this for HT support (802.11n) and WME (802.11e).
@@ -77,7 +78,24 @@ CONFIG_IWLWIFI=m
CONFIG_IWLCORE=m
CONFIG_IWL3945=m
CONFIG_IWL4965=m
-CONFIG_IWL4965_HT=y
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLWIFI_RFKILL=y
+CONFIG_IWL3945_LEDS=y
+CONFIG_IWL5000=y
+
+ifeq ($(CONFIG_IWL5000),y)
+ifeq ($(CONFIG_IWL4965),)
+$(warning "WARNING: CONFIG_IWL5000 requires CONFIG_IWL4965 is configured as m.")
+CONFIG_IWL4965=m
+endif # CONFIG_IWL4965 is empty
+endif # CONFIG_IWL5000 is y
+
+CONFIG_IWLWIFI_DEBUG=y
+
+ifeq ($(CONFIG_MAC80211_DEBUGFS),y)
+CONFIG_IWLWIFI_DEBUGFS=y
+endif
+
CONFIG_B43=m
# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
# Example, bcm4318:
On Thu, Jul 17, 2008 at 02:48:53AM -0700, Luis R. Rodriguez wrote:
> On Thu, Jul 17, 2008 at 1:29 AM, Tomas Winkler <[email protected]> wrote:
> > On Thu, Jul 17, 2008 at 11:15 AM, Yingying Zhao
> > <[email protected]> wrote:
> >> Latest iwlwifi in wireless-testing removed CONFIG_IWL4965_HT and
> >> introduced CONFIG_IWL5000 for Intel Wireless WiFi 5000AGN support
> >> which is built in IWL4965 module. This patch also enables IWLWIFI_LEDS,
> >> IWLWIFI_RFKILL,IWL3945_LEDS IWLWIFI_DEBUG for iwlwifi build by default.
> >>
> >> Signed-off-by: Zhao Yingying <[email protected]>
> >> ---
> >> config.mk | 20 +++++++++++++++++++-
> >> 1 file changed, 19 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/config.mk b/config.mk
> >> index b1fb68e..cafadfa 100644
> >> --- a/config.mk
> >> +++ b/config.mk
> >> @@ -15,6 +15,7 @@ endif
> >>
> >> # Wireless subsystem stuff
> >> CONFIG_MAC80211=m
> >> +CONFIG_MAC80211_LEDS=y
> >>
> >> # Enable QOS for 2.6.22, we'll do some hacks here to enable it.
> >> # You will need this for HT support (802.11n) and WME (802.11e).
> >> @@ -77,7 +78,24 @@ CONFIG_IWLWIFI=m
> >> CONFIG_IWLCORE=m
> >> CONFIG_IWL3945=m
> >> CONFIG_IWL4965=m
> >> -CONFIG_IWL4965_HT=y
> >> +CONFIG_IWLWIFI_LEDS=y
> >> +CONFIG_IWLWIFI_RFKILL=y
> >> +CONFIG_IWL3945_LEDS=y
> >> +CONFIG_IWL5000=y
> >> +
> >> +ifeq ($(CONFIG_IWL5000),y)
> >> +ifeq ($(CONFIG_IWL4965),)
> >> +$(warning "WARNING: CONFIG_IWL5000 requires CONFIG_IWL4965 is configured as m.")
> >> +CONFIG_IWL4965=m
> >> +endif # CONFIG_IWL4965 is empty
> >> +endif # CONFIG_IWL5000 is y
> >> +
> >> +CONFIG_IWLWIFI_DEBUG=y
> >> +
> >> +ifeq ($(CONFIG_MAC80211_DEBUGFS),y)
> >> +CONFIG_IWLWIFI_DEBUGFS=y
> >> +endif
> >> +
> >> CONFIG_B43=m
> >> # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
> >> # Example, bcm4318:
> >
> > I'm changing iwlwifi Kconfig so please hold this patch.
>
> Also, was this tested with 2.6.22?
>
> Luis
No. I just tested on 2.6.24.
I'll wait for iwlwifi Kconfig is finalized by Tomas and retest this on
2.6.22.
Yingying
On Thu, Jul 17, 2008 at 1:29 AM, Tomas Winkler <[email protected]> wrote:
> On Thu, Jul 17, 2008 at 11:15 AM, Yingying Zhao
> <[email protected]> wrote:
>> Latest iwlwifi in wireless-testing removed CONFIG_IWL4965_HT and
>> introduced CONFIG_IWL5000 for Intel Wireless WiFi 5000AGN support
>> which is built in IWL4965 module. This patch also enables IWLWIFI_LEDS,
>> IWLWIFI_RFKILL,IWL3945_LEDS IWLWIFI_DEBUG for iwlwifi build by default.
>>
>> Signed-off-by: Zhao Yingying <[email protected]>
>> ---
>> config.mk | 20 +++++++++++++++++++-
>> 1 file changed, 19 insertions(+), 1 deletion(-)
>>
>> diff --git a/config.mk b/config.mk
>> index b1fb68e..cafadfa 100644
>> --- a/config.mk
>> +++ b/config.mk
>> @@ -15,6 +15,7 @@ endif
>>
>> # Wireless subsystem stuff
>> CONFIG_MAC80211=m
>> +CONFIG_MAC80211_LEDS=y
>>
>> # Enable QOS for 2.6.22, we'll do some hacks here to enable it.
>> # You will need this for HT support (802.11n) and WME (802.11e).
>> @@ -77,7 +78,24 @@ CONFIG_IWLWIFI=m
>> CONFIG_IWLCORE=m
>> CONFIG_IWL3945=m
>> CONFIG_IWL4965=m
>> -CONFIG_IWL4965_HT=y
>> +CONFIG_IWLWIFI_LEDS=y
>> +CONFIG_IWLWIFI_RFKILL=y
>> +CONFIG_IWL3945_LEDS=y
>> +CONFIG_IWL5000=y
>> +
>> +ifeq ($(CONFIG_IWL5000),y)
>> +ifeq ($(CONFIG_IWL4965),)
>> +$(warning "WARNING: CONFIG_IWL5000 requires CONFIG_IWL4965 is configured as m.")
>> +CONFIG_IWL4965=m
>> +endif # CONFIG_IWL4965 is empty
>> +endif # CONFIG_IWL5000 is y
>> +
>> +CONFIG_IWLWIFI_DEBUG=y
>> +
>> +ifeq ($(CONFIG_MAC80211_DEBUGFS),y)
>> +CONFIG_IWLWIFI_DEBUGFS=y
>> +endif
>> +
>> CONFIG_B43=m
>> # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
>> # Example, bcm4318:
>
> I'm changing iwlwifi Kconfig so please hold this patch.
Also, was this tested with 2.6.22?
Luis
On Thu, Jul 17, 2008 at 6:21 AM, Luis R. Rodriguez
<[email protected]> wrote:
> On Thu, Jul 17, 2008 at 3:07 AM, Luis R. Rodriguez
> <[email protected]> wrote:
>> On Thu, Jul 17, 2008 at 3:04 AM, Yingying Zhao
>> <[email protected]> wrote:
>>
>>>> Also, was this tested with 2.6.22?
>>>>
>>>> Luis
>>> No. I just tested on 2.6.24.
>>> I'll wait for iwlwifi Kconfig is finalized by Tomas and retest this on
>>> 2.6.22.
>>
>> OK cool -- just a heads up then, I hadn't enabled LEDs or RFKILL
>> options for drivers as the framework needs backporting. Once
>> backported I expect it will compile well for older kernels.
>
> compat-wireless wasn't actually compiling for 2.6.22 anymore. I just
> fixed that. It loads mac80211. Either I did a mistake or we get an
> oops now when loading a driver on 2.6.22.
Yeah ok I can confirm there is a bug there on 2.6.22. We hit:
BUG_ON(!local || local->mdev == dev);
on ieee80211_i.h in IEEE80211_DEV_TO_SUB_IF()
Don't have time to debug this right now though.
Luis
On Thu, Jul 17, 2008 at 11:15 AM, Yingying Zhao
<[email protected]> wrote:
> Latest iwlwifi in wireless-testing removed CONFIG_IWL4965_HT and
> introduced CONFIG_IWL5000 for Intel Wireless WiFi 5000AGN support
> which is built in IWL4965 module. This patch also enables IWLWIFI_LEDS,
> IWLWIFI_RFKILL,IWL3945_LEDS IWLWIFI_DEBUG for iwlwifi build by default.
>
> Signed-off-by: Zhao Yingying <[email protected]>
> ---
> config.mk | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/config.mk b/config.mk
> index b1fb68e..cafadfa 100644
> --- a/config.mk
> +++ b/config.mk
> @@ -15,6 +15,7 @@ endif
>
> # Wireless subsystem stuff
> CONFIG_MAC80211=m
> +CONFIG_MAC80211_LEDS=y
>
> # Enable QOS for 2.6.22, we'll do some hacks here to enable it.
> # You will need this for HT support (802.11n) and WME (802.11e).
> @@ -77,7 +78,24 @@ CONFIG_IWLWIFI=m
> CONFIG_IWLCORE=m
> CONFIG_IWL3945=m
> CONFIG_IWL4965=m
> -CONFIG_IWL4965_HT=y
> +CONFIG_IWLWIFI_LEDS=y
> +CONFIG_IWLWIFI_RFKILL=y
> +CONFIG_IWL3945_LEDS=y
> +CONFIG_IWL5000=y
> +
> +ifeq ($(CONFIG_IWL5000),y)
> +ifeq ($(CONFIG_IWL4965),)
> +$(warning "WARNING: CONFIG_IWL5000 requires CONFIG_IWL4965 is configured as m.")
> +CONFIG_IWL4965=m
> +endif # CONFIG_IWL4965 is empty
> +endif # CONFIG_IWL5000 is y
> +
> +CONFIG_IWLWIFI_DEBUG=y
> +
> +ifeq ($(CONFIG_MAC80211_DEBUGFS),y)
> +CONFIG_IWLWIFI_DEBUGFS=y
> +endif
> +
> CONFIG_B43=m
> # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
> # Example, bcm4318:
I'm changing iwlwifi Kconfig so please hold this patch.
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Thu, Jul 17, 2008 at 9:05 AM, Luis R. Rodriguez
<[email protected]> wrote:
> Yeah ok I can confirm there is a bug there on 2.6.22. We hit:
>
> BUG_ON(!local || local->mdev == dev);
>
> on ieee80211_i.h in IEEE80211_DEV_TO_SUB_IF()
>
> Don't have time to debug this right now though.
To that extent I'm disabling compilation for 2.6.22 until this is
fixed, don't want users running into it.
Luis
On Thu, Jul 17, 2008 at 3:07 AM, Luis R. Rodriguez
<[email protected]> wrote:
> On Thu, Jul 17, 2008 at 3:04 AM, Yingying Zhao
> <[email protected]> wrote:
>
>>> Also, was this tested with 2.6.22?
>>>
>>> Luis
>> No. I just tested on 2.6.24.
>> I'll wait for iwlwifi Kconfig is finalized by Tomas and retest this on
>> 2.6.22.
>
> OK cool -- just a heads up then, I hadn't enabled LEDs or RFKILL
> options for drivers as the framework needs backporting. Once
> backported I expect it will compile well for older kernels.
compat-wireless wasn't actually compiling for 2.6.22 anymore. I just
fixed that. It loads mac80211. Either I did a mistake or we get an
oops now when loading a driver on 2.6.22.
Luis
On Thu, Jul 17, 2008 at 3:04 AM, Yingying Zhao
<[email protected]> wrote:
>> Also, was this tested with 2.6.22?
>>
>> Luis
> No. I just tested on 2.6.24.
> I'll wait for iwlwifi Kconfig is finalized by Tomas and retest this on
> 2.6.22.
OK cool -- just a heads up then, I hadn't enabled LEDs or RFKILL
options for drivers as the framework needs backporting. Once
backported I expect it will compile well for older kernels.
Luis