Re: linux-next: Tree for November 24 (iwlwifi-fix)

Re: linux-next: Tree for November 24 (iwlwifi-fix)

[Sedat Dilek]

Hi,

the patch from Randy from [1] still applies, but my build-log from
yesterday's linux-next shows:

$ grep ^WARNING build_linux-next_next20101123.dileks.1.log | grep iwl
WARNING: drivers/net/wireless/iwlwifi/iwlagn:
'iwl_legacy_tx_cmd_protection' exported twice. Previous export was in
drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_isr_legacy'
exported twice. Previous export was in
drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn:
'iwl_legacy_mac_bss_info_changed' exported twice. Previous export was
in drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn:
'iwl_legacy_mac_reset_tsf' exported twice. Previous export was in
drivers/net/wireless/iwlwifi/iwl3945.ko
WARNING: drivers/net/wireless/iwlwifi/iwlagn: 'iwl_legacy_mac_config'
exported twice. Previous export was in
drivers/net/wireless/iwlwifi/iwl3945.ko

The fix is doing:

[ drivers/net/wireless/iwlwifi/Makefile ]
...
-iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o
-iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o
...
-iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
+iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwl-legacy.o
...
-iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o
+iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o
iwl-3945-led.o iwl-legacy.o

So why do I see warnings in iwl3945.ko but not in iwl-4965.ko?

Is that fix still required? Fixed in wireless-next-2.6?

Regards,
- Sedat -

[1] https://patchwork.kernel.org/patch/322492/

Re: linux-next: Tree for November 24 (iwlwifi-fix)

[Johannes Berg]

On Wed, 2010-11-24 at 07:09 +0100, Sedat Dilek wrote:

> Is that fix still required? Fixed in wireless-next-2.6?

That patch was causing that problem, but I fixed the original problem
since.

johannes

Re: linux-next: Tree for November 24 (iwlwifi-fix)

[Sedat Dilek]

On Wed, Nov 24, 2010 at 7:14 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Wed, 2010-11-24 at 07:09 +0100, Sedat Dilek wrote:
>
>> Is that fix still required? Fixed in wireless-next-2.6?
>
> That patch was causing that problem, but I fixed the original problem
> since.
>
> johannes
>

Thanks for the quick reply.

I dropped that patch in my series and it looks good now (compile-tested):

$ grep iwl build_linux-next_next20101124.dileks.1.log
  LD      drivers/net/wireless/iwlwifi/built-in.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl3945-base.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-3945.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-3945-rs.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-3945-led.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-rs.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-led.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-ucode.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-tx.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-lib.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-rx.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-calib.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-tt.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-sta.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-eeprom.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-4965.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-rxon.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-hcmd.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-agn-ict.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-5000.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-6000.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-1000.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-core.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-eeprom.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-hcmd.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-power.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-rx.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-tx.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-sta.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-scan.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-led.o
  CC [M]  drivers/net/wireless/iwlwifi/iwl-legacy.o
  LD [M]  drivers/net/wireless/iwlwifi/iwlcore.o
  LD [M]  drivers/net/wireless/iwlwifi/iwlagn.o
  LD [M]  drivers/net/wireless/iwlwifi/iwl3945.o
  CC      drivers/net/wireless/iwlwifi/iwl3945.mod.o
  CC      drivers/net/wireless/iwlwifi/iwlagn.mod.o
  CC      drivers/net/wireless/iwlwifi/iwlcore.mod.o
  LD [M]  drivers/net/wireless/iwlwifi/iwl3945.ko
  LD [M]  drivers/net/wireless/iwlwifi/iwlagn.ko
  LD [M]  drivers/net/wireless/iwlwifi/iwlcore.ko
  INSTALL drivers/net/wireless/iwlwifi/iwl3945.ko
  INSTALL drivers/net/wireless/iwlwifi/iwlagn.ko
  INSTALL drivers/net/wireless/iwlwifi/iwlcore.ko

- Sedat -