package/kernel/mac80211/patches/652-0003-rtl8xxxu-Obtain-ieee80211_rx_status-within-parse_rx_.patch

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