1 From 04319ae2f60974fa218f16fdf7a8576d1db6d673 Mon Sep 17 00:00:00 2001
2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
3 Date: Mon, 27 Jun 2016 12:32:04 -0400
4 Subject: [PATCH] rtl8xxxu: Allocate larger RX skbs when aggregation is enabled
6 This adds support for allocating larger skbs for devices which
7 indicate they support it.
9 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
10 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
12 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 ++
13 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 13 +++++++++----
14 2 files changed, 11 insertions(+), 4 deletions(-)
16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
18 @@ -1247,6 +1247,7 @@ struct rtl8xxxu_priv {
19 u32 ep_tx_normal_queue:1;
20 u32 ep_tx_low_queue:1;
22 + u32 rx_buf_aggregation:1;
24 unsigned int pipe_interrupt;
26 @@ -1330,6 +1331,7 @@ struct rtl8xxxu_fileops {
27 void (*report_connect) (struct rtl8xxxu_priv *priv,
28 u8 macid, bool connect);
29 int writeN_block_size;
30 + int rx_agg_buf_size;
34 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
35 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
36 @@ -64,8 +64,6 @@ module_param_named(ht40_2g, rtl8xxxu_ht4
37 MODULE_PARM_DESC(ht40_2g, "Enable HT40 support on the 2.4GHz band");
39 #define USB_VENDOR_ID_REALTEK 0x0bda
40 -/* Minimum IEEE80211_MAX_FRAME_LEN */
41 -#define RTL_RX_BUFFER_SIZE IEEE80211_MAX_FRAME_LEN
42 #define RTL8XXXU_RX_URBS 32
43 #define RTL8XXXU_RX_URB_PENDING_WATER 8
44 #define RTL8XXXU_TX_URBS 64
45 @@ -5271,12 +5269,19 @@ cleanup:
46 static int rtl8xxxu_submit_rx_urb(struct rtl8xxxu_priv *priv,
47 struct rtl8xxxu_rx_urb *rx_urb)
49 + struct rtl8xxxu_fileops *fops = priv->fops;
54 - rx_desc_sz = priv->fops->rx_desc_size;
55 - skb_size = rx_desc_sz + RTL_RX_BUFFER_SIZE;
56 + rx_desc_sz = fops->rx_desc_size;
58 + if (priv->rx_buf_aggregation && fops->rx_agg_buf_size)
59 + skb_size = fops->rx_agg_buf_size;
61 + skb_size = IEEE80211_MAX_FRAME_LEN;
62 + skb_size += rx_desc_sz;
64 skb = __netdev_alloc_skb(NULL, skb_size, GFP_KERNEL);