package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch

   1 From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
   2 Date: Fri, 2 Nov 2018 21:49:56 +0100
   3 Subject: [PATCH] ath9k: dynack: move debug log after buffer increments
   4
   5 Move debug log in ath_dynack_sample_tx_ts and ath_dynack_sample_ack_ts
   6 after timestamp buffer head/tail increments in order to make debugging
   7 more user friendly
   8
   9 Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  10 Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
  11 ---
  12
  13 --- a/drivers/net/wireless/ath/ath9k/dynack.c
  14 +++ b/drivers/net/wireless/ath/ath9k/dynack.c
  15 @@ -178,11 +178,12 @@ void ath_dynack_sample_tx_ts(struct ath_
  16                              struct ath_tx_status *ts,
  17                              struct ieee80211_sta *sta)
  18  {
  19 -       u8 ridx;
  20         struct ieee80211_hdr *hdr;
  21         struct ath_dynack *da = &ah->dynack;
  22         struct ath_common *common = ath9k_hw_common(ah);
  23         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
  24 +       u32 dur = ts->duration;
  25 +       u8 ridx;
  26
  27         if (!da->enabled || (info->flags & IEEE80211_TX_CTL_NO_ACK))
  28                 return;
  29 @@ -217,14 +218,13 @@ void ath_dynack_sample_tx_ts(struct ath_
  30         ridx = ts->ts_rateindex;
  31
  32         da->st_rbf.ts[da->st_rbf.t_rb].tstamp = ts->ts_tstamp;
  33 -       da->st_rbf.ts[da->st_rbf.t_rb].dur = ts->duration;
  34         ether_addr_copy(da->st_rbf.addr[da->st_rbf.t_rb].h_dest, hdr->addr1);
  35         ether_addr_copy(da->st_rbf.addr[da->st_rbf.t_rb].h_src, hdr->addr2);
  36
  37         if (!(info->status.rates[ridx].flags & IEEE80211_TX_RC_MCS)) {
  38 -               u32 phy, sifs;
  39                 const struct ieee80211_rate *rate;
  40                 struct ieee80211_tx_rate *rates = info->status.rates;
  41 +               u32 phy;
  42
  43                 rate = &common->sbands[info->band].bitrates[rates[ridx].idx];
  44                 if (info->band == NL80211_BAND_2GHZ &&
  45 @@ -233,19 +233,18 @@ void ath_dynack_sample_tx_ts(struct ath_
  46                 else
  47                         phy = WLAN_RC_PHY_OFDM;
  48
  49 -               sifs = ath_dynack_get_sifs(ah, phy);
  50 -               da->st_rbf.ts[da->st_rbf.t_rb].dur -= sifs;
  51 +               dur -= ath_dynack_get_sifs(ah, phy);
  52         }
  53 -
  54 -       ath_dbg(common, DYNACK, "{%pM} tx sample %u [dur %u][h %u-t %u]\n",
  55 -               hdr->addr1, da->st_rbf.ts[da->st_rbf.t_rb].tstamp,
  56 -               da->st_rbf.ts[da->st_rbf.t_rb].dur, da->st_rbf.h_rb,
  57 -               (da->st_rbf.t_rb + 1) % ATH_DYN_BUF);
  58 +       da->st_rbf.ts[da->st_rbf.t_rb].dur = dur;
  59
  60         INCR(da->st_rbf.t_rb, ATH_DYN_BUF);
  61         if (da->st_rbf.t_rb == da->st_rbf.h_rb)
  62                 INCR(da->st_rbf.h_rb, ATH_DYN_BUF);
  63
  64 +       ath_dbg(common, DYNACK, "{%pM} tx sample %u [dur %u][h %u-t %u]\n",
  65 +               hdr->addr1, ts->ts_tstamp, dur, da->st_rbf.h_rb,
  66 +               da->st_rbf.t_rb);
  67 +
  68         ath_dynack_compute_to(ah);
  69
  70         spin_unlock_bh(&da->qlock);
  71 @@ -272,14 +271,13 @@ void ath_dynack_sample_ack_ts(struct ath
  72         spin_lock_bh(&da->qlock);
  73         da->ack_rbf.tstamp[da->ack_rbf.t_rb] = ts;
  74
  75 -       ath_dbg(common, DYNACK, "rx sample %u [h %u-t %u]\n",
  76 -               da->ack_rbf.tstamp[da->ack_rbf.t_rb],
  77 -               da->ack_rbf.h_rb, (da->ack_rbf.t_rb + 1) % ATH_DYN_BUF);
  78 -
  79         INCR(da->ack_rbf.t_rb, ATH_DYN_BUF);
  80         if (da->ack_rbf.t_rb == da->ack_rbf.h_rb)
  81                 INCR(da->ack_rbf.h_rb, ATH_DYN_BUF);
  82
  83 +       ath_dbg(common, DYNACK, "rx sample %u [h %u-t %u]\n",
  84 +               ts, da->ack_rbf.h_rb, da->ack_rbf.t_rb);
  85 +
  86         ath_dynack_compute_to(ah);
  87
  88         spin_unlock_bh(&da->qlock);