package/kernel/mac80211/patches/317-mac80211-minstrel_ht-switch-to-.tx_status_noskb.patch

   1 From: Felix Fietkau <nbd@openwrt.org>
   2 Date: Sat, 15 Nov 2014 22:38:21 +0100
   3 Subject: [PATCH] mac80211: minstrel_ht: switch to .tx_status_noskb
   4
   5 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
   6 ---
   7
   8 --- a/net/mac80211/rc80211_minstrel_ht.c
   9 +++ b/net/mac80211/rc80211_minstrel_ht.c
  10 @@ -709,11 +709,10 @@ minstrel_aggr_check(struct ieee80211_sta
  11  static void
  12  minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
  13                        struct ieee80211_sta *sta, void *priv_sta,
  14 -                      struct sk_buff *skb)
  15 +                      struct ieee80211_tx_info *info)
  16  {
  17         struct minstrel_ht_sta_priv *msp = priv_sta;
  18         struct minstrel_ht_sta *mi = &msp->ht;
  19 -       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
  20         struct ieee80211_tx_rate *ar = info->status.rates;
  21         struct minstrel_rate_stats *rate, *rate2;
  22         struct minstrel_priv *mp = priv;
  23 @@ -721,7 +720,8 @@ minstrel_ht_tx_status(void *priv, struct
  24         int i;
  25
  26         if (!msp->is_ht)
  27 -               return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb);
  28 +               return mac80211_minstrel.tx_status_noskb(priv, sband, sta,
  29 +                                                        &msp->legacy, info);
  30
  31         /* This packet was aggregated but doesn't carry status info */
  32         if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
  33 @@ -1343,7 +1343,7 @@ static u32 minstrel_ht_get_expected_thro
  34
  35  static const struct rate_control_ops mac80211_minstrel_ht = {
  36         .name = "minstrel_ht",
  37 -       .tx_status = minstrel_ht_tx_status,
  38 +       .tx_status_noskb = minstrel_ht_tx_status,
  39         .get_rate = minstrel_ht_get_rate,
  40         .rate_init = minstrel_ht_rate_init,
  41         .rate_update = minstrel_ht_rate_update,