diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-09 06:18:09 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-09 06:18:09 +0400 |
| commit | 341352d13dae752610342923c53ebe461624ee2c (patch) | |
| tree | 05797e3686984b0e1b963882e886e95817c1d4dc /drivers/net | |
| parent | 70c33eaae79e53f9e48324736c0cb85534d3f093 (diff) | |
| download | linux-341352d13dae752610342923c53ebe461624ee2c.tar.xz | |
iwlwifi: fix-up some merge damage from commit 0d6c4a2
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c index 0c252c5d8bf1..5b80467a5bb1 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); |