Skip to content

Commit

Permalink
rtl8xxxu: Do not parse RX descriptor info for C2H packets
Browse files Browse the repository at this point in the history
C2H events are delivered as RX packets on 8723bu/8192eu. When
receiving a C2H event, do not parse the rest of the RX descriptor as
the info isn't valid.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Jes Sorensen authored and Kalle Valo committed Mar 10, 2016
1 parent 4c68360 commit e975b87
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
Original file line number Diff line number Diff line change
Expand Up @@ -7324,7 +7324,6 @@ static int rtl8723bu_parse_rx_desc(struct rtl8xxxu_priv *priv,
(struct rtl8723bu_rx_desc *)skb->data;
struct rtl8723au_phy_stats *phy_stats;
int drvinfo_sz, desc_shift;
int rx_type;

skb_pull(skb, sizeof(struct rtl8723bu_rx_desc));

Expand All @@ -7334,6 +7333,12 @@ static int rtl8723bu_parse_rx_desc(struct rtl8xxxu_priv *priv,
desc_shift = rx_desc->shift;
skb_pull(skb, drvinfo_sz + desc_shift);

if (rx_desc->rpt_sel) {
struct device *dev = &priv->udev->dev;
dev_dbg(dev, "%s: C2H packet\n", __func__);
return RX_TYPE_C2H;
}

rx_status->mactime = le32_to_cpu(rx_desc->tsfl);
rx_status->flag |= RX_FLAG_MACTIME_START;

Expand All @@ -7351,15 +7356,7 @@ static int rtl8723bu_parse_rx_desc(struct rtl8xxxu_priv *priv,
rx_status->rate_idx = rx_desc->rxmcs;
}

if (rx_desc->rpt_sel) {
struct device *dev = &priv->udev->dev;
dev_dbg(dev, "%s: C2H packet\n", __func__);
rx_type = RX_TYPE_C2H;
} else {
rx_type = RX_TYPE_DATA_PKT;
}

return rx_type;
return RX_TYPE_DATA_PKT;
}

static void rtl8723bu_handle_c2h(struct rtl8xxxu_priv *priv,
Expand Down

0 comments on commit e975b87

Please sign in to comment.