iwlwifi: fix-up some merge damage from commit 0d6c4a2

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index 0c252c5d8bf13543f3f40121ce671812b6559c95..5b80467a5bb12c015dad6eaac8afbb3b3fb048ed 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -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);