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