package/mac80211/patches/465-ath5k_remove_ts_rate.patch

   1 --- a/drivers/net/wireless/ath/ath5k/ath5k.h
   2 +++ b/drivers/net/wireless/ath/ath5k/ath5k.h
   3 @@ -452,7 +452,6 @@ struct ath5k_tx_status {
   4         u16     ts_seqnum;
   5         u16     ts_tstamp;
   6         u8      ts_status;
   7 -       u8      ts_rate[4];
   8         u8      ts_retry[4];
   9         u8      ts_final_idx;
  10         s8      ts_rssi;
  11 --- a/drivers/net/wireless/ath/ath5k/desc.c
  12 +++ b/drivers/net/wireless/ath/ath5k/desc.c
  13 @@ -375,8 +375,6 @@ static int ath5k_hw_proc_2word_tx_status
  14                 AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH);
  15         ts->ts_antenna = 1;
  16         ts->ts_status = 0;
  17 -       ts->ts_rate[0] = AR5K_REG_MS(tx_ctl->tx_control_0,
  18 -               AR5K_2W_TX_DESC_CTL0_XMIT_RATE);
  19         ts->ts_retry[0] = ts->ts_longretry;
  20         ts->ts_final_idx = 0;
  21
  22 @@ -439,32 +437,21 @@ static int ath5k_hw_proc_4word_tx_status
  23         ts->ts_retry[ts->ts_final_idx] = ts->ts_longretry;
  24         switch (ts->ts_final_idx) {
  25         case 3:
  26 -               ts->ts_rate[3] = AR5K_REG_MS(tx_ctl->tx_control_3,
  27 -                       AR5K_4W_TX_DESC_CTL3_XMIT_RATE3);
  28 -
  29                 ts->ts_retry[2] = AR5K_REG_MS(tx_ctl->tx_control_2,
  30                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2);
  31                 ts->ts_longretry += ts->ts_retry[2];
  32                 /* fall through */
  33         case 2:
  34 -               ts->ts_rate[2] = AR5K_REG_MS(tx_ctl->tx_control_3,
  35 -                       AR5K_4W_TX_DESC_CTL3_XMIT_RATE2);
  36 -
  37                 ts->ts_retry[1] = AR5K_REG_MS(tx_ctl->tx_control_2,
  38                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);
  39                 ts->ts_longretry += ts->ts_retry[1];
  40                 /* fall through */
  41         case 1:
  42 -               ts->ts_rate[1] = AR5K_REG_MS(tx_ctl->tx_control_3,
  43 -                       AR5K_4W_TX_DESC_CTL3_XMIT_RATE1);
  44 -
  45                 ts->ts_retry[0] = AR5K_REG_MS(tx_ctl->tx_control_2,
  46                         AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1);
  47                 ts->ts_longretry += ts->ts_retry[0];
  48                 /* fall through */
  49         case 0:
  50 -               ts->ts_rate[0] = tx_ctl->tx_control_3 &
  51 -                       AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
  52                 break;
  53         }
  54