package/kernel/mac80211/patches/650-0008-rtl8xxxu-Obtain-ieee80211_rx_status-within-parse_rx_.patch

   1 From d6e54e5f7c011c2396c4cec56ca8e8e5cf1c89da Mon Sep 17 00:00:00 2001
   2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
   3 Date: Mon, 16 May 2016 22:13:22 -0400
   4 Subject: [PATCH] rtl8xxxu: Obtain ieee80211_rx_status within parse_rx_desc()
   5
   6 When handling aggregated packets, we'll get a new ieee80211_rx_status
   7 for each cloned skb, so passing in the pointer from the outside
   8 doesn't make sense.
   9
  10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  11 ---
  12  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h      |  9 +++------
  13  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +++++------
  14  2 files changed, 8 insertions(+), 12 deletions(-)
  15
  16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
  17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
  18 @@ -1315,8 +1315,7 @@ struct rtl8xxxu_fileops {
  19         void (*phy_init_antenna_selection) (struct rtl8xxxu_priv *priv);
  20         void (*phy_iq_calibrate) (struct rtl8xxxu_priv *priv);
  21         void (*config_channel) (struct ieee80211_hw *hw);
  22 -       int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb,
  23 -                             struct ieee80211_rx_status *rx_status);
  24 +       int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb);
  25         void (*init_aggregation) (struct rtl8xxxu_priv *priv);
  26         void (*init_statistics) (struct rtl8xxxu_priv *priv);
  27         void (*enable_rf) (struct rtl8xxxu_priv *priv);
  28 @@ -1412,10 +1411,8 @@ void rtl8xxxu_gen2_report_connect(struct
  29  void rtl8xxxu_gen1_enable_rf(struct rtl8xxxu_priv *priv);
  30  void rtl8xxxu_gen1_disable_rf(struct rtl8xxxu_priv *priv);
  31  void rtl8xxxu_gen2_disable_rf(struct rtl8xxxu_priv *priv);
  32 -int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
  33 -                           struct ieee80211_rx_status *rx_status);
  34 -int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
  35 -                           struct ieee80211_rx_status *rx_status);
  36 +int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb);
  37 +int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb);
  38  int rtl8xxxu_gen2_channel_to_group(int channel);
  39  bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv,
  40                                       int result[][8], int c1, int c2);
  41 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  42 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  43 @@ -5090,10 +5090,10 @@ static void rtl8723bu_handle_c2h(struct
  44         }
  45  }
  46
  47 -int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
  48 -                           struct ieee80211_rx_status *rx_status)
  49 +int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
  50  {
  51         struct ieee80211_hw *hw = priv->hw;
  52 +       struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
  53         struct rtl8xxxu_rxdesc16 *rx_desc =
  54                 (struct rtl8xxxu_rxdesc16 *)skb->data;
  55         struct rtl8723au_phy_stats *phy_stats;
  56 @@ -5143,10 +5143,10 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8x
  57         return RX_TYPE_DATA_PKT;
  58  }
  59
  60 -int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb,
  61 -                           struct ieee80211_rx_status *rx_status)
  62 +int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
  63  {
  64         struct ieee80211_hw *hw = priv->hw;
  65 +       struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
  66         struct rtl8xxxu_rxdesc24 *rx_desc =
  67                 (struct rtl8xxxu_rxdesc24 *)skb->data;
  68         struct rtl8723au_phy_stats *phy_stats;
  69 @@ -5211,13 +5211,12 @@ static void rtl8xxxu_rx_complete(struct
  70         struct ieee80211_hw *hw = rx_urb->hw;
  71         struct rtl8xxxu_priv *priv = hw->priv;
  72         struct sk_buff *skb = (struct sk_buff *)urb->context;
  73 -       struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
  74         struct device *dev = &priv->udev->dev;
  75
  76         skb_put(skb, urb->actual_length);
  77
  78         if (urb->status == 0) {
  79 -               priv->fops->parse_rx_desc(priv, skb, rx_status);
  80 +               priv->fops->parse_rx_desc(priv, skb);
  81
  82                 skb = NULL;
  83                 rx_urb->urb.context = NULL;