mmotm0812 - something in linux-next killed iwl-3945.c

mmotm0812 - something in linux-next killed iwl-3945.c

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

Build bombs out:

  CC      drivers/net/wireless/iwlwifi/iwl-3945.o
drivers/net/wireless/iwlwifi/iwl-3945.c: In function 'iwl3945_pass_packet_to_mac80211':
drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)
drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: (Each undeclared identifier is reported only once
drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: for each function it appears in.)
make[1]: *** [drivers/net/wireless/iwlwifi/iwl-3945.o] Error 1

due to this in linux-next.patch:

index 46288e7..ae7f163 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
(skipping)
@@ -577,7 +577,10 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv
 *priv,
        if (ieee80211_is_data(hdr->frame_control))
                priv->rxtxpackets += len;
 #endif
-       ieee80211_rx_irqsafe(priv->hw, rxb->skb, stats);
+       iwl_update_stats(priv, false, hdr->frame_control, len);
+
+       memcpy(IEEE80211_SKB_RXCB(rxb->skb), stats, sizeof(*stats));
+       ieee80211_rx_irqsafe(priv->hw, rxb->skb);
        rxb->skb = NULL;

Sorry, don't have a linux-next git tree, so no 'git blame' for what did it.
Hopefully somebody recognizes their handiwork... ;)

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

Re: [ipw3945-devel] mmotm0812 - something in linux-next killed iwl-3945.c

[John W. Linville]

On Thu, Aug 13, 2009 at 12:59:54PM -0400, Valdis.Kletnieks@vt.edu wrote:
> Build bombs out:
> 
>   CC      drivers/net/wireless/iwlwifi/iwl-3945.o
> drivers/net/wireless/iwlwifi/iwl-3945.c: In function 'iwl3945_pass_packet_to_mac80211':
> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)
> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: (Each undeclared identifier is reported only once
> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: for each function it appears in.)
> make[1]: *** [drivers/net/wireless/iwlwifi/iwl-3945.o] Error 1
> 
> due to this in linux-next.patch:
> 
> index 46288e7..ae7f163 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
> (skipping)
> @@ -577,7 +577,10 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv
>  *priv,
>         if (ieee80211_is_data(hdr->frame_control))
>                 priv->rxtxpackets += len;
>  #endif
> -       ieee80211_rx_irqsafe(priv->hw, rxb->skb, stats);
> +       iwl_update_stats(priv, false, hdr->frame_control, len);
> +
> +       memcpy(IEEE80211_SKB_RXCB(rxb->skb), stats, sizeof(*stats));
> +       ieee80211_rx_irqsafe(priv->hw, rxb->skb);
>         rxb->skb = NULL;
> 
> Sorry, don't have a linux-next git tree, so no 'git blame' for what did it.
> Hopefully somebody recognizes their handiwork... ;)

I think this is the LEDS-related build failure, which already has a patch.

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [ipw3945-devel] mmotm0812 - something in linux-next killed iwl-3945.c

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

On Thu, 13 Aug 2009 13:28:19 EDT, "John W. Linville" said:
> On Thu, Aug 13, 2009 at 12:59:54PM -0400, Valdis.Kletnieks@vt.edu wrote:
> > Build bombs out:
> > 
> >   CC      drivers/net/wireless/iwlwifi/iwl-3945.o
> > drivers/net/wireless/iwlwifi/iwl-3945.c: In function 'iwl3945_pass_packet_to_mac80211':
> > drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)
> > drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: (Each undeclared identifier is reported only once
> > drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: for each function it appears in.)
> > make[1]: *** [drivers/net/wireless/iwlwifi/iwl-3945.o] Error 1

> > Sorry, don't have a linux-next git tree, so no 'git blame' for what did it.
> > Hopefully somebody recognizes their handiwork... ;)
> 
> I think this is the LEDS-related build failure, which already has a patch.

Found Kalle Valo's patch removing the #ifdef's in the linux-wireless
archives, build is now proceeding thanks...

Now to figure out how I managed to trip over it, CONFIG_IWLWIFI_LEDS looks
like a config option I would have selected...

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

Re: [ipw3945-devel] mmotm0812 - something in linux-next killed iwl-3945.c

[Kalle Valo]

"John W. Linville" <linville@tuxdriver.com> writes:

> On Thu, Aug 13, 2009 at 12:59:54PM -0400, Valdis.Kletnieks@vt.edu wrote:
>> Build bombs out:
>> 
>>   CC      drivers/net/wireless/iwlwifi/iwl-3945.o
>> drivers/net/wireless/iwlwifi/iwl-3945.c: In function 'iwl3945_pass_packet_to_mac80211':
>> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)

[...]

>> Sorry, don't have a linux-next git tree, so no 'git blame' for what did it.
>> Hopefully somebody recognizes their handiwork... ;)
>
> I think this is the LEDS-related build failure, which already has a patch.

Correct. This patch fixes it:

http://git.kernel.org/?p=linux/kernel/git/linville/wireless-testing.git;a=commit;h=44f282ff0e3797555e9ac54d8a772b65f72e3702

-- 
Kalle Valo