From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 May 2012 02:18:09 +0000 (-0400)
Subject: iwlwifi: fix-up some merge damage from commit 0d6c4a2
X-Git-Tag: v3.5-rc1~109^2~79^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=341352d13dae752610342923c53ebe461624ee2c;p=profile%2Fivi%2Fkernel-x86-ivi.git

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 0c252c5..5b80467 100644
--- 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);