iwlwifi: fix-up some merge damage from commit 0d6c4a2
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 May 2012 02:18:09 +0000 (22:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 May 2012 02:18:09 +0000 (22:18 -0400)
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-rx.c

index 0c252c5..5b80467 100644 (file)
@@ -764,7 +764,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
        fraglen = len - hdrlen;
 
        if (fraglen) {
-               int offset = (void *)hdr - rxb_addr(rxb) + rxb_offset(rxb);
+               int offset = (void *)hdr + hdrlen -
+                            rxb_addr(rxb) + rxb_offset(rxb);
 
                skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
                                fraglen, rxb->truesize);