092e77d948
Patches by Jes Sorensen: https://git.kernel.org/cgit/linux/kernel/git/jes/linux.git/ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
83 lines
3.7 KiB
Diff
83 lines
3.7 KiB
Diff
From d6e54e5f7c011c2396c4cec56ca8e8e5cf1c89da Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 16 May 2016 22:13:22 -0400
|
|
Subject: [PATCH] rtl8xxxu: Obtain ieee80211_rx_status within parse_rx_desc()
|
|
|
|
When handling aggregated packets, we'll get a new ieee80211_rx_status
|
|
for each cloned skb, so passing in the pointer from the outside
|
|
doesn't make sense.
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 9 +++------
|
|
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +++++------
|
|
2 files changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
|
|
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
|
|
@@ -1315,8 +1315,7 @@ struct rtl8xxxu_fileops {
|
|
void (*phy_init_antenna_selection) (struct rtl8xxxu_priv *priv);
|
|
void (*phy_iq_calibrate) (struct rtl8xxxu_priv *priv);
|
|
void (*config_channel) (struct ieee80211_hw *hw);
|
|
- int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb,
|
|
- struct ieee80211_rx_status *rx_status);
|
|
+ int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb);
|
|
void (*init_aggregation) (struct rtl8xxxu_priv *priv);
|
|
void (*init_statistics) (struct rtl8xxxu_priv *priv);
|
|
void (*enable_rf) (struct rtl8xxxu_priv *priv);
|
|
@@ -1412,10 +1411,8 @@ void rtl8xxxu_gen2_report_connect(struct
|
|
void rtl8xxxu_gen1_enable_rf(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen1_disable_rf(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen2_disable_rf(struct rtl8xxxu_priv *priv);
|
|
-int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
|
|
- struct ieee80211_rx_status *rx_status);
|
|
-int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
|
|
- struct ieee80211_rx_status *rx_status);
|
|
+int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb);
|
|
+int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb);
|
|
int rtl8xxxu_gen2_channel_to_group(int channel);
|
|
bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv,
|
|
int result[][8], int c1, int c2);
|
|
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
|
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
|
@@ -5090,10 +5090,10 @@ static void rtl8723bu_handle_c2h(struct
|
|
}
|
|
}
|
|
|
|
-int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
|
|
- struct ieee80211_rx_status *rx_status)
|
|
+int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
|
|
{
|
|
struct ieee80211_hw *hw = priv->hw;
|
|
+ struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
struct rtl8xxxu_rxdesc16 *rx_desc =
|
|
(struct rtl8xxxu_rxdesc16 *)skb->data;
|
|
struct rtl8723au_phy_stats *phy_stats;
|
|
@@ -5143,10 +5143,10 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
|
|
return RX_TYPE_DATA_PKT;
|
|
}
|
|
|
|
-int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
|
|
- struct ieee80211_rx_status *rx_status)
|
|
+int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
|
|
{
|
|
struct ieee80211_hw *hw = priv->hw;
|
|
+ struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
struct rtl8xxxu_rxdesc24 *rx_desc =
|
|
(struct rtl8xxxu_rxdesc24 *)skb->data;
|
|
struct rtl8723au_phy_stats *phy_stats;
|
|
@@ -5211,13 +5211,12 @@ static void rtl8xxxu_rx_complete(struct
|
|
struct ieee80211_hw *hw = rx_urb->hw;
|
|
struct rtl8xxxu_priv *priv = hw->priv;
|
|
struct sk_buff *skb = (struct sk_buff *)urb->context;
|
|
- struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
struct device *dev = &priv->udev->dev;
|
|
|
|
skb_put(skb, urb->actual_length);
|
|
|
|
if (urb->status == 0) {
|
|
- priv->fops->parse_rx_desc(priv, skb, rx_status);
|
|
+ priv->fops->parse_rx_desc(priv, skb);
|
|
|
|
skb = NULL;
|
|
rx_urb->urb.context = NULL;
|