summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2016-06-27 19:32:05 +0300
committerKalle Valo <kvalo@codeaurora.org>2016-07-08 16:41:56 +0300
commit1e5b3b3fe9e00a3afe3092dbe1a3fc1e9079bf35 (patch)
treedfd395a9b5bdaffa1ebd74823d08eb0338553622 /drivers/net
parent04319ae2f60974fa218f16fdf7a8576d1db6d673 (diff)
downloadlinux-1e5b3b3fe9e00a3afe3092dbe1a3fc1e9079bf35.tar.xz
rtl8xxxu: Adjust RX skb size to include space for phystats
The old allocation didn't leave space for phystats in the buffer, allowing the packet to be rejected if a frame size of size IEEE80211_MAX_FRAME_LEN was received. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 75149e49f333..898601accabb 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5276,11 +5276,12 @@ static int rtl8xxxu_submit_rx_urb(struct rtl8xxxu_priv *priv,
rx_desc_sz = fops->rx_desc_size;
- if (priv->rx_buf_aggregation && fops->rx_agg_buf_size)
+ if (priv->rx_buf_aggregation && fops->rx_agg_buf_size) {
skb_size = fops->rx_agg_buf_size;
- else
+ skb_size += (rx_desc_sz + sizeof(struct rtl8723au_phy_stats));
+ } else {
skb_size = IEEE80211_MAX_FRAME_LEN;
- skb_size += rx_desc_sz;
+ }
skb = __netdev_alloc_skb(NULL, skb_size, GFP_KERNEL);
if (!skb)