diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-05-19 11:47:44 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-05-19 11:47:44 +0300 |
| commit | fb53905cf2c3db6eb1ce37a37c5002456fa7ee20 (patch) | |
| tree | 52c6f0bc2987803a10732a2acb772882d4189eb6 /drivers/net/wireless/ath/ath6kl | |
| parent | a1ad7198202ff9a2436bd24437730e78d90c5271 (diff) | |
| parent | b01c9e327249e4995e5b5b6cebec14166db9c1e7 (diff) | |
| download | linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.xz | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.13. Major changes:
ath10k
* add initial SDIO support (still work in progress)
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/txrx.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index a531e0c5c1e2..e6b2517e6334 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -399,15 +399,10 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev) csum_dest = skb->csum_offset + csum_start; } - if (skb_headroom(skb) < dev->needed_headroom) { - struct sk_buff *tmp_skb = skb; - - skb = skb_realloc_headroom(skb, dev->needed_headroom); - kfree_skb(tmp_skb); - if (skb == NULL) { - dev->stats.tx_dropped++; - return 0; - } + if (skb_cow_head(skb, dev->needed_headroom)) { + dev->stats.tx_dropped++; + kfree_skb(skb); + return 0; } if (ath6kl_wmi_dix_2_dot3(ar->wmi, skb)) { |