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

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2012-05-08 22:18:09 -04:00
parent 70c33eaae7
commit 341352d13d
1 changed files with 2 additions and 1 deletions

View File

@ -764,7 +764,8 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
fraglen = len - hdrlen; fraglen = len - hdrlen;
if (fraglen) { 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, skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
fraglen, rxb->truesize); fraglen, rxb->truesize);