From: Jes Sorensen Date: Mon, 27 Jun 2016 16:32:05 +0000 (-0400) Subject: rtl8xxxu: Adjust RX skb size to include space for phystats X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e5b3b3fe9e00a3afe3092dbe1a3fc1e9079bf35;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Kalle Valo --- 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)