package/kernel/mac80211/patches/650-0011-rtl8xxxu-Allocate-larger-RX-skbs-when-aggregation-is.patch

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