package/kernel/mac80211/patches/652-0005-rtl8xxxu-Add-support-for-aggregated-RX-packets-on-ge.patch

   1 From 040b97be60567b819b97442d30533884bd266874 Mon Sep 17 00:00:00 2001
   2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
   3 Date: Mon, 27 Jun 2016 12:32:03 -0400
   4 Subject: [PATCH] rtl8xxxu: Add support for aggregated RX packets on gen1 parts
   5
   6 This implements support for demuxing aggregated RX packets on gen1
   7 devices, using the rxdesc16 format.
   8
   9 So far this has only been tested with rtl8723au devices.
  10
  11 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  13 ---
  14  .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 103 ++++++++++++++-------
  15  1 file changed, 69 insertions(+), 34 deletions(-)
  16
  17 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  18 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  19 @@ -5093,53 +5093,88 @@ static void rtl8723bu_handle_c2h(struct
  20  int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
  21  {
  22         struct ieee80211_hw *hw = priv->hw;
  23 -       struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
  24 -       struct rtl8xxxu_rxdesc16 *rx_desc =
  25 -               (struct rtl8xxxu_rxdesc16 *)skb->data;
  26 +       struct ieee80211_rx_status *rx_status;
  27 +       struct rtl8xxxu_rxdesc16 *rx_desc;
  28         struct rtl8723au_phy_stats *phy_stats;
  29 -       __le32 *_rx_desc_le = (__le32 *)skb->data;
  30 -       u32 *_rx_desc = (u32 *)skb->data;
  31 +       struct sk_buff *next_skb = NULL;
  32 +       __le32 *_rx_desc_le;
  33 +       u32 *_rx_desc;
  34         int drvinfo_sz, desc_shift;
  35 -       int i;
  36 +       int i, pkt_cnt, pkt_len, urb_len, pkt_offset;
  37
  38 -       for (i = 0; i < (sizeof(struct rtl8xxxu_rxdesc16) / sizeof(u32)); i++)
  39 -               _rx_desc[i] = le32_to_cpu(_rx_desc_le[i]);
  40 +       urb_len = skb->len;
  41 +       pkt_cnt = 0;
  42
  43 -       memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
  44 +       do {
  45 +               rx_desc = (struct rtl8xxxu_rxdesc16 *)skb->data;
  46 +               _rx_desc_le = (__le32 *)skb->data;
  47 +               _rx_desc = (u32 *)skb->data;
  48
  49 -       skb_pull(skb, sizeof(struct rtl8xxxu_rxdesc16));
  50 +               for (i = 0;
  51 +                    i < (sizeof(struct rtl8xxxu_rxdesc16) / sizeof(u32)); i++)
  52 +                       _rx_desc[i] = le32_to_cpu(_rx_desc_le[i]);
  53
  54 -       phy_stats = (struct rtl8723au_phy_stats *)skb->data;
  55 +               /*
  56 +                * Only read pkt_cnt from the header if we're parsing the
  57 +                * first packet
  58 +                */
  59 +               if (!pkt_cnt)
  60 +                       pkt_cnt = rx_desc->pkt_cnt;
  61 +               pkt_len = rx_desc->pktlen;
  62
  63 -       drvinfo_sz = rx_desc->drvinfo_sz * 8;
  64 -       desc_shift = rx_desc->shift;
  65 -       skb_pull(skb, drvinfo_sz + desc_shift);
  66 +               drvinfo_sz = rx_desc->drvinfo_sz * 8;
  67 +               desc_shift = rx_desc->shift;
  68 +               pkt_offset = roundup(pkt_len + drvinfo_sz + desc_shift +
  69 +                                    sizeof(struct rtl8xxxu_rxdesc16), 128);
  70
  71 -       if (rx_desc->phy_stats)
  72 -               rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
  73 -                                          rx_desc->rxmcs);
  74 +               if (pkt_cnt > 1)
  75 +                       next_skb = skb_clone(skb, GFP_ATOMIC);
  76
  77 -       rx_status->mactime = le32_to_cpu(rx_desc->tsfl);
  78 -       rx_status->flag |= RX_FLAG_MACTIME_START;
  79 +               rx_status = IEEE80211_SKB_RXCB(skb);
  80 +               memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
  81
  82 -       if (!rx_desc->swdec)
  83 -               rx_status->flag |= RX_FLAG_DECRYPTED;
  84 -       if (rx_desc->crc32)
  85 -               rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
  86 -       if (rx_desc->bw)
  87 -               rx_status->flag |= RX_FLAG_40MHZ;
  88 +               skb_pull(skb, sizeof(struct rtl8xxxu_rxdesc16));
  89
  90 -       if (rx_desc->rxht) {
  91 -               rx_status->flag |= RX_FLAG_HT;
  92 -               rx_status->rate_idx = rx_desc->rxmcs - DESC_RATE_MCS0;
  93 -       } else {
  94 -               rx_status->rate_idx = rx_desc->rxmcs;
  95 -       }
  96 +               phy_stats = (struct rtl8723au_phy_stats *)skb->data;
  97
  98 -       rx_status->freq = hw->conf.chandef.chan->center_freq;
  99 -       rx_status->band = hw->conf.chandef.chan->band;
 100 +               skb_pull(skb, drvinfo_sz + desc_shift);
 101 +
 102 +               skb_trim(skb, pkt_len);
 103 +
 104 +               if (rx_desc->phy_stats)
 105 +                       rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
 106 +                                                  rx_desc->rxmcs);
 107 +
 108 +               rx_status->mactime = le32_to_cpu(rx_desc->tsfl);
 109 +               rx_status->flag |= RX_FLAG_MACTIME_START;
 110 +
 111 +               if (!rx_desc->swdec)
 112 +                       rx_status->flag |= RX_FLAG_DECRYPTED;
 113 +               if (rx_desc->crc32)
 114 +                       rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 115 +               if (rx_desc->bw)
 116 +                       rx_status->flag |= RX_FLAG_40MHZ;
 117 +
 118 +               if (rx_desc->rxht) {
 119 +                       rx_status->flag |= RX_FLAG_HT;
 120 +                       rx_status->rate_idx = rx_desc->rxmcs - DESC_RATE_MCS0;
 121 +               } else {
 122 +                       rx_status->rate_idx = rx_desc->rxmcs;
 123 +               }
 124 +
 125 +               rx_status->freq = hw->conf.chandef.chan->center_freq;
 126 +               rx_status->band = hw->conf.chandef.chan->band;
 127 +
 128 +               ieee80211_rx_irqsafe(hw, skb);
 129 +
 130 +               skb = next_skb;
 131 +               if (skb)
 132 +                       skb_pull(next_skb, pkt_offset);
 133 +
 134 +               pkt_cnt--;
 135 +               urb_len -= pkt_offset;
 136 +       } while (skb && urb_len > 0 && pkt_cnt > 0);
 137
 138 -       ieee80211_rx_irqsafe(hw, skb);
 139         return RX_TYPE_DATA_PKT;
 140  }
 141