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

From: Valdis.Kletnieks@vt.edu
To: Andrew Morton <akpm@linux-foundation.org>, Zhu Yi <yi.zhu@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
	ipw3945-devel@lists.sourceforge.net
Subject: mmotm0812 - something in linux-next killed iwl-3945.c
Date: Thu, 13 Aug 2009 12:59:54 -0400	[thread overview]
Message-ID: <19728.1250182794@turing-police.cc.vt.edu> (raw)

[-- 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 --]
