package/kernel/mt76/patches/001-mac80211-4-14-api.patch

   1 --- a/mt76x2_mac.c
   2 +++ b/mt76x2_mac.c
   3 @@ -46,7 +46,7 @@ mt76x2_mac_process_rate(struct ieee80211
   4         case MT_PHY_TYPE_CCK:
   5                 if (idx >= 8) {
   6                         idx -= 8;
   7 -                       status->flag |= RX_FLAG_SHORTPRE;
   8 +                       status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
   9                 }
  10
  11                 if (idx >= 4)
  12 @@ -55,16 +55,16 @@ mt76x2_mac_process_rate(struct ieee80211
  13                 status->rate_idx = idx;
  14                 return;
  15         case MT_PHY_TYPE_HT_GF:
  16 -               status->flag |= RX_FLAG_HT_GF;
  17 +               status->enc_flags |= RX_ENC_FLAG_HT_GF;
  18                 /* fall through */
  19         case MT_PHY_TYPE_HT:
  20 -               status->flag |= RX_FLAG_HT;
  21 +               status->encoding = RX_ENC_HT;
  22                 status->rate_idx = idx;
  23                 break;
  24         case MT_PHY_TYPE_VHT:
  25 -               status->flag |= RX_FLAG_VHT;
  26 +               status->encoding = RX_ENC_VHT;
  27                 status->rate_idx = FIELD_GET(MT_RATE_INDEX_VHT_IDX, idx);
  28 -               status->vht_nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
  29 +               status->nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
  30                 break;
  31         default:
  32                 WARN_ON(1);
  33 @@ -72,22 +72,22 @@ mt76x2_mac_process_rate(struct ieee80211
  34         }
  35
  36         if (rate & MT_RXWI_RATE_LDPC)
  37 -               status->flag |= RX_FLAG_LDPC;
  38 +               status->enc_flags |= RX_ENC_FLAG_LDPC;
  39
  40         if (rate & MT_RXWI_RATE_SGI)
  41 -               status->flag |= RX_FLAG_SHORT_GI;
  42 +               status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
  43
  44         if (rate & MT_RXWI_RATE_STBC)
  45 -               status->flag |= 1 << RX_FLAG_STBC_SHIFT;
  46 +               status->enc_flags |= 1 << RX_ENC_FLAG_STBC_SHIFT;
  47
  48         switch (FIELD_GET(MT_RXWI_RATE_BW, rate)) {
  49         case MT_PHY_BW_20:
  50                 break;
  51         case MT_PHY_BW_40:
  52 -               status->flag |= RX_FLAG_40MHZ;
  53 +               status->bw = RATE_INFO_BW_40;
  54                 break;
  55         case MT_PHY_BW_80:
  56 -               status->vht_flag |= RX_VHT_FLAG_80MHZ;
  57 +               status->bw = RATE_INFO_BW_80;
  58                 break;
  59         default:
  60                 break;
  61 --- a/mt7603_mac.c
  62 +++ b/mt7603_mac.c
  63 @@ -411,19 +411,19 @@ mt7603_mac_fill_rx(struct mt7603_dev *de
  64                         break;
  65                 case MT_PHY_TYPE_HT_GF:
  66                 case MT_PHY_TYPE_HT:
  67 -                       status->flag |= RX_FLAG_HT;
  68 +                       status->encoding = RX_ENC_HT;
  69                         break;
  70                 case MT_PHY_TYPE_VHT:
  71 -                       status->flag |= RX_FLAG_VHT;
  72 +                       status->encoding = RX_ENC_VHT;
  73                         break;
  74                 default:
  75                         WARN_ON(1);
  76                 }
  77
  78                 if (rxdg0 & MT_RXV1_HT_SHORT_GI)
  79 -                       status->flag |= RX_FLAG_SHORT_GI;
  80 +                       status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
  81
  82 -               status->flag |= RX_FLAG_STBC_MASK *
  83 +               status->enc_flags |= RX_ENC_FLAG_STBC_MASK *
  84                                     FIELD_GET(MT_RXV1_HT_STBC, rxdg0);
  85
  86                 status->rate_idx = i;