298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolsnowwolf/lede

Browse Source
This commit is contained in:
lean 2021-06-15 18:06:28 +08:00
commit bc569574df
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/lean/mt/drivers/mt7612e/src/mt76x2/ap/ap_wds.c
View File

@ -275,11 +275,11 @@ MAC_TABLE_ENTRY *MacTableInsertWDSEntry(
if ((wdev->PhyMode == MODE_VHT) && if ((wdev->PhyMode == MODE_VHT) &&
(pAd->CommonCfg.Channel > 14)) (pAd->CommonCfg.Channel > 14))
{ {
VHT_CAP_IE vht_cap; VHT_CAP_IE *vht_cap = NULL;
VHT_CAP_INFO *vht_cap_info; VHT_CAP_INFO *vht_cap_info;
build_vht_cap_ie(pAd, (UCHAR *)&vht_cap); build_vht_cap_ie(pAd, (UCHAR *)vht_cap);
vht_cap_info = (VHT_CAP_INFO *)&vht_cap; vht_cap_info = (VHT_CAP_INFO *)vht_cap;
pEntry->MaxHTPhyMode.field.MODE = MODE_VHT; pEntry->MaxHTPhyMode.field.MODE = MODE_VHT;
@ -287,25 +287,25 @@ MAC_TABLE_ENTRY *MacTableInsertWDSEntry(
pEntry->MaxHTPhyMode.field.BW = BW_80; pEntry->MaxHTPhyMode.field.BW = BW_80;
/* TODO: implement get_vht_max_mcs to get peer max MCS */ /* TODO: implement get_vht_max_mcs to get peer max MCS */
if (vht_cap.mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_9) { if (vht_cap->mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_9) {
if ((pEntry->MaxHTPhyMode.field.BW == BW_20)) if ((pEntry->MaxHTPhyMode.field.BW == BW_20))
pEntry->MaxHTPhyMode.field.MCS = 8; pEntry->MaxHTPhyMode.field.MCS = 8;
else else
pEntry->MaxHTPhyMode.field.MCS = 9; pEntry->MaxHTPhyMode.field.MCS = 9;
} else if (vht_cap.mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_8) { } else if (vht_cap->mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_8) {
pEntry->MaxHTPhyMode.field.MCS = 8; pEntry->MaxHTPhyMode.field.MCS = 8;
} else if (vht_cap.mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_7) { } else if (vht_cap->mcs_set.rx_mcs_map.mcs_ss1 == VHT_MCS_CAP_7) {
pEntry->MaxHTPhyMode.field.MCS = 7; pEntry->MaxHTPhyMode.field.MCS = 7;
} }
if (vht_cap.mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_9) { if (vht_cap->mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_9) {
if ((pEntry->MaxHTPhyMode.field.BW == BW_20)) if ((pEntry->MaxHTPhyMode.field.BW == BW_20))
pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 8); pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 8);
else else
pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 9); pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 9);
} else if (vht_cap.mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_8) { } else if (vht_cap->mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_8) {
pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 8); pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 8);
} else if (vht_cap.mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_7) { } else if (vht_cap->mcs_set.rx_mcs_map.mcs_ss2 == VHT_MCS_CAP_7) {
pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 7); pEntry->MaxHTPhyMode.field.MCS = ((1 << 4) | 7);
} }
@ -333,7 +333,7 @@ MAC_TABLE_ENTRY *MacTableInsertWDSEntry(
if (vht_cap_info->rx_stbc) if (vht_cap_info->rx_stbc)
CLIENT_STATUS_SET_FLAG(pEntry, fCLIENT_STATUS_VHT_RXSTBC_CAPABLE); CLIENT_STATUS_SET_FLAG(pEntry, fCLIENT_STATUS_VHT_RXSTBC_CAPABLE);
} }
NdisMoveMemory(&pEntry->vht_cap_ie, &vht_cap, sizeof(VHT_CAP_IE)); NdisMoveMemory(&pEntry->vht_cap_ie, vht_cap, sizeof(VHT_CAP_IE));
} }
else else
{ {
@ -707,7 +707,7 @@ VOID WdsPeerBeaconProc(
IN ULONG ClientRalinkIe, IN ULONG ClientRalinkIe,
#ifdef DOT11_VHT_AC #ifdef DOT11_VHT_AC
IN UCHAR vht_cap_len, IN UCHAR vht_cap_len,
IN VHT_CAP_IE *vht_cap, IN VHT_CAP_IE vht_cap[],
#endif /* DOT11_VHT_AC */ #endif /* DOT11_VHT_AC */
IN HT_CAPABILITY_IE *pHtCapability, IN HT_CAPABILITY_IE *pHtCapability,
IN UCHAR HtCapabilityLen) IN UCHAR HtCapabilityLen)
@ -883,7 +883,7 @@ VOID WdsPeerBeaconProc(
if (vht_cap_info->rx_stbc) if (vht_cap_info->rx_stbc)
CLIENT_STATUS_SET_FLAG(pEntry, fCLIENT_STATUS_VHT_RXSTBC_CAPABLE); CLIENT_STATUS_SET_FLAG(pEntry, fCLIENT_STATUS_VHT_RXSTBC_CAPABLE);
} }
NdisMoveMemory(&pEntry->vht_cap_ie, &vht_cap, sizeof(VHT_CAP_IE)); NdisMoveMemory(&pEntry->vht_cap_ie, vht_cap, sizeof(VHT_CAP_IE));
} }
else else
{ {