diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-28 02:15:01 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-28 02:15:01 (GMT) |
| commit | 7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch) | |
| tree | f6a3c26bccbd31e144c8c68fda979988739d4af5 /drivers/net/wireless/ath/ath9k/recv.c | |
| parent | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (diff) | |
| parent | 643c61e119459e9d750087b7b34be94491efebf9 (diff) | |
| download | linux-fsl-qoriq-7dd30d447b7f4a129586cce8e57d0163dde876b0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index f4ae3ba..1c4583c 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -1913,13 +1913,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) if (sc->rx.frag) { int space = skb->len - skb_tailroom(hdr_skb); - sc->rx.frag = NULL; - if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) { dev_kfree_skb(skb); goto requeue_drop_frag; } + sc->rx.frag = NULL; + skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len), skb->len); dev_kfree_skb_any(skb); |