mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-26 07:04:12 +00:00
Code Releases Activity

Fix errors from all patches added earlier

Browse Source
This commit is contained in:
kimocoder 2019-09-19 21:05:00 +02:00
parent 9d91ee955a
commit 4fe60d92e5
11 changed files with 5269 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/rtw_ieee80211.c
View File

@ -1577,13 +1577,10 @@ extern char *rtw_initmac;
* @out: buf to store mac address decided * @out: buf to store mac address decided
* @hw_mac_addr: mac address from efuse/epprom * @hw_mac_addr: mac address from efuse/epprom
*/ */
void rtw_macaddr_cfg(struct device *dev, u8 *out, const u8 *hw_mac_addr) void rtw_macaddr_cfg(u8 *out, const u8 *hw_mac_addr)
{ {
#define DEFAULT_RANDOM_MACADDR 1 #define DEFAULT_RANDOM_MACADDR 1
u8 mac[ETH_ALEN]; u8 mac[ETH_ALEN];
struct device_node *np = dev->of_node;
const unsigned char *addr;
int len;
if (out == NULL) { if (out == NULL) {
rtw_warn_on(1); rtw_warn_on(1);
@ -1614,27 +1611,21 @@ void rtw_macaddr_cfg(struct device *dev, u8 *out, const u8 *hw_mac_addr)
err_chk: err_chk:
if (rtw_check_invalid_mac_address(mac, _TRUE) == _TRUE) { if (rtw_check_invalid_mac_address(mac, _TRUE) == _TRUE) {
if (np && #if DEFAULT_RANDOM_MACADDR
(addr = of_get_property(np, "local-mac-address", &len)) && RTW_ERR("invalid mac addr:"MAC_FMT", assign random MAC\n", MAC_ARG(mac));
len == ETH_ALEN) { *((u32 *)(&mac[2])) = rtw_random32();
memcpy(mac, addr, ETH_ALEN); mac[0] = 0x00;
} else { mac[1] = 0xe0;
#if DEFAULT_RANDOM_MACADDR mac[2] = 0x4c;
DBG_871X_LEVEL(_drv_err_, "invalid mac addr:"MAC_FMT", assign random MAC\n", MAC_ARG(mac)); #else
*((u32 *)(&mac[2])) = rtw_random32(); RTW_ERR("invalid mac addr:"MAC_FMT", assign default one\n", MAC_ARG(mac));
mac[0] = 0x00; mac[0] = 0x00;
mac[1] = 0xe0; mac[1] = 0xe0;
mac[2] = 0x4c; mac[2] = 0x4c;
#else mac[3] = 0x87;
DBG_871X_LEVEL(_drv_err_, "invalid mac addr:"MAC_FMT", assign default one\n", MAC_ARG(mac)); mac[4] = 0x00;
mac[0] = 0x00; mac[5] = 0x00;
mac[1] = 0xe0; #endif
mac[2] = 0x4c;
mac[3] = 0x87;
mac[4] = 0x00;
mac[5] = 0x00;
#endif
}
} }
_rtw_memcpy(out, mac, ETH_ALEN); _rtw_memcpy(out, mac, ETH_ALEN);

146
core/rtw_recv.c
View File

@ -3943,7 +3943,7 @@ exit:
} }
#endif #endif
static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe) static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, u8 *buf)
{ {
#define CHAN2FREQ(a) ((a < 14) ? (2407+5*a) : (5000+5*a)) #define CHAN2FREQ(a) ((a < 14) ? (2407+5*a) : (5000+5*a))
@ -3999,7 +3999,7 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe)
u16 tmp_16bit = 0; u16 tmp_16bit = 0;
static u8 data_rate[] = { u8 data_rate[] = {
2, 4, 11, 22, /* CCK */ 2, 4, 11, 22, /* CCK */
12, 18, 24, 36, 48, 72, 93, 108, /* OFDM */ 12, 18, 24, 36, 48, 72, 93, 108, /* OFDM */
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* HT MCS index */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* HT MCS index */
@ -4015,61 +4015,12 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe)
struct ieee80211_radiotap_header *rtap_hdr = NULL; struct ieee80211_radiotap_header *rtap_hdr = NULL;
u8 *ptr = NULL; u8 *ptr = NULL;
#ifdef CONFIG_RADIOTAP_WITH_RXDESC
u8 hdr_buf[128] = {0};
#else
u8 hdr_buf[64] = {0}; u8 hdr_buf[64] = {0};
#endif
u16 rt_len = 8; u16 rt_len = 8;
uint vendor_oui = 0;
__le32 *it_present, *it_start;
u32 it_present_val;
int i;
/* create header */ /* create header */
rtap_hdr = (struct ieee80211_radiotap_header *)&hdr_buf[0]; rtap_hdr = (struct ieee80211_radiotap_header *)&hdr_buf[0];
rtap_hdr->it_version = PKTHDR_RADIOTAP_VERSION; rtap_hdr->it_version = PKTHDR_RADIOTAP_VERSION;
it_start = it_present = &rtap_hdr->it_present;
it_present_val = BIT(IEEE80211_RADIOTAP_FLAGS) |
BIT(IEEE80211_RADIOTAP_CHANNEL) |
BIT(IEEE80211_RADIOTAP_RX_FLAGS);
if (pHalData->NumTotalRFPath <= 1)
it_present_val |= BIT(IEEE80211_RADIOTAP_ANTENNA);
if(pHalData->NumTotalRFPath>0 && pattrib->physt) {
if(pHalData->NumTotalRFPath>1) {
for(i=0; i<pHalData->NumTotalRFPath - 1; i++) {
it_present_val |= BIT(IEEE80211_RADIOTAP_EXT) |
BIT(IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE);
//memcpy(it_present, &it_present_val, 4);
put_unaligned_le32(it_present_val, it_present);
it_present++;
it_present_val = BIT(IEEE80211_RADIOTAP_ANTENNA) |
BIT(IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
}
}
#ifdef CONFIG_RADIOTAP_WITH_RXDESC
it_present_val |= BIT(IEEE80211_RADIOTAP_EXT) |
BIT(IEEE80211_RADIOTAP_VENDOR_NAMESPACE);
put_unaligned_le32(it_present_val, it_present);
it_present++;
parse_beacon_vendor_oui(padapter, precvframe, &vendor_oui);
it_present_val = vendor_oui;
#endif
put_unaligned_le32(it_present_val, it_present);
it_present++;
rt_len += (4*(it_present - it_start) - 4);
} else {
#ifdef CONFIG_RADIOTAP_WITH_RXDESC
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_VENDOR_NAMESPACE);
#endif
}
/* tsft */ /* tsft */
if (pattrib->tsfl) { if (pattrib->tsfl) {
@ -4159,35 +4110,27 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe)
memcpy(&hdr_buf[rt_len], &tmp_16bit, 2); memcpy(&hdr_buf[rt_len], &tmp_16bit, 2);
rt_len += 2; rt_len += 2;
if(pattrib->physt) { /* dBm Antenna Signal */
/* dBm Antenna Signal */ rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL); hdr_buf[rt_len] = pattrib->phy_info.recv_signal_power;
hdr_buf[rt_len] = pattrib->phy_info.RecvSignalPower; rt_len += 1;
rt_len += 1;
#if 0 #if 0
/* dBm Antenna Noise */ /* dBm Antenna Noise */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE); rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE);
hdr_buf[rt_len] = 0; hdr_buf[rt_len] = 0;
rt_len += 1; rt_len += 1;
#else
rt_len++; // alignment
#endif
}
/* Signal Quality */ /* Signal Quality */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_LOCK_QUALITY); rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_LOCK_QUALITY);
tmp_16bit = cpu_to_le16(pattrib->phy_info.SignalQuality); hdr_buf[rt_len] = pattrib->phy_info.signal_quality;
memcpy(&hdr_buf[rt_len], &tmp_16bit, 2); rt_len += 1;
rt_len += 2; #endif
#if 0
/* Antenna */ /* Antenna */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_ANTENNA); rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_ANTENNA);
hdr_buf[rt_len] = pHalData->rf_type; hdr_buf[rt_len] = 0; /* pHalData->rf_type; */
rt_len += 1; rt_len += 1;
rt_len++; // alignment
#endif
/* RX flags */ /* RX flags */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_RX_FLAGS); rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_RX_FLAGS);
@ -4294,64 +4237,24 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe)
rt_len += 2; rt_len += 2;
} }
if (pattrib->physt) {
for(i=0; i<pHalData->NumTotalRFPath; i++) {
hdr_buf[rt_len] = pattrib->phy_info.RxPwr[i];
rt_len ++;
hdr_buf[rt_len] = i;
rt_len ++;
}
}
#ifdef CONFIG_RADIOTAP_WITH_RXDESC
rt_len += rt_len&1;
hdr_buf[rt_len++] = 0xde;
hdr_buf[rt_len++] = 0xab;
hdr_buf[rt_len++] = 0xbe;
hdr_buf[rt_len++] = 0xaf;
hdr_buf[rt_len++] = 24;
hdr_buf[rt_len++] = 0;
_rtw_memcpy(hdr_buf + rt_len, pattrib->rxdesc, RXDESC_SIZE);
rt_len += RXDESC_SIZE;
#endif
/* push to skb */ /* push to skb */
/* read skb information from recv frame */ pskb = (_pkt *)buf;
pskb = precvframe->u.hdr.pkt;
pskb->len = precvframe->u.hdr.len;
pskb->data = precvframe->u.hdr.rx_data;
skb_set_tail_pointer(pskb, precvframe->u.hdr.len);
if (skb_headroom(pskb) < rt_len) { if (skb_headroom(pskb) < rt_len) {
pskb = skb_realloc_headroom(pskb, rt_len); RTW_INFO("%s:%d %s headroom is too small.\n", __FILE__, __LINE__, __func__);
if(pskb == NULL) { ret = _FAIL;
RTW_INFO("%s:%d %s headroom is too small.\n", __FILE__, __LINE__, __func__); return ret;
ret = _FAIL;
return ret;
}
precvframe->u.hdr.pkt = pskb;
} }
ptr = skb_push(pskb, rt_len); ptr = skb_push(pskb, rt_len);
if (ptr) { if (ptr) {
rtap_hdr->it_len = cpu_to_le16(rt_len); rtap_hdr->it_len = cpu_to_le16(rt_len);
rtap_hdr->it_present = cpu_to_le32(rtap_hdr->it_present); rtap_hdr->it_present = cpu_to_le32(rtap_hdr->it_present);
_rtw_memcpy(ptr, rtap_hdr, rt_len); memcpy(ptr, rtap_hdr, rt_len);
} else { } else
ret = _FAIL;
return ret;
}
out:
/* write skb information to recv frame */
skb_reset_mac_header(pskb);
precvframe->u.hdr.len = pskb->len;
precvframe->u.hdr.rx_data = pskb->data;
precvframe->u.hdr.rx_head = pskb->head;
precvframe->u.hdr.rx_tail = skb_tail_pointer(pskb);
precvframe->u.hdr.rx_end = skb_end_pointer(pskb);
ret = _FAIL; ret = _FAIL;
return ret; return ret;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
int recv_frame_monitor(_adapter *padapter, union recv_frame *rframe) int recv_frame_monitor(_adapter *padapter, union recv_frame *rframe)
@ -4360,14 +4263,27 @@ int recv_frame_monitor(_adapter *padapter, union recv_frame *rframe)
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
_pkt *pskb = NULL; _pkt *pskb = NULL;
/* read skb information from recv frame */
pskb = rframe->u.hdr.pkt;
pskb->len = rframe->u.hdr.len;
pskb->data = rframe->u.hdr.rx_data;
skb_set_tail_pointer(pskb, rframe->u.hdr.len);
#ifndef CONFIG_CUSTOMER_ALIBABA_GENERAL #ifndef CONFIG_CUSTOMER_ALIBABA_GENERAL
/* fill radiotap header */ /* fill radiotap header */
if (fill_radiotap_hdr(padapter, rframe) == _FAIL) { if (fill_radiotap_hdr(padapter, rframe, (u8 *)pskb) == _FAIL) {
ret = _FAIL; ret = _FAIL;
rtw_free_recvframe(rframe, pfree_recv_queue); /* free this recv_frame */ rtw_free_recvframe(rframe, pfree_recv_queue); /* free this recv_frame */
goto exit; goto exit;
} }
#endif #endif
/* write skb information to recv frame */
skb_reset_mac_header(pskb);
rframe->u.hdr.len = pskb->len;
rframe->u.hdr.rx_data = pskb->data;
rframe->u.hdr.rx_head = pskb->head;
rframe->u.hdr.rx_tail = skb_tail_pointer(pskb);
rframe->u.hdr.rx_end = skb_end_pointer(pskb);
if (!RTW_CANNOT_RUN(padapter)) { if (!RTW_CANNOT_RUN(padapter)) {
/* indicate this recv_frame */ /* indicate this recv_frame */

46
core/rtw_vht.c
View File

@ -106,44 +106,38 @@ void dump_vht_op_ie(void *sel, const u8 *ie, u32 ie_len)
} }
/* 20/40/80, ShortGI, MCS Rate */ /* 20/40/80, ShortGI, MCS Rate */
const u16 VHT_MCS_DATA_RATE[3][2][40] = { const u16 VHT_MCS_DATA_RATE[3][2][30] = {
{ { { {
7, 13, 20, 26, 39, 52, 59, 65, 78, 78, /*1T1R*/ 13, 26, 39, 52, 78, 104, 117, 130, 156, 156,
13, 26, 39, 52, 78, 104, 117, 130, 156, 156, /*2T2R*/ 26, 52, 78, 104, 156, 208, 234, 260, 312, 312,
20, 39, 59, 78, 117, 156, 176, 195, 234, 260, /*3T3R*/ 39, 78, 117, 156, 234, 312, 351, 390, 468, 520
26, 52, 78, 104, 156, 208, 234, 260, 312, 312 /*4T4R*/
}, /* Long GI, 20MHz */ }, /* Long GI, 20MHz */
{ {
7, 14, 22, 29, 43, 58, 65, 72, 87, 87, /*1T1R*/ 14, 29, 43, 58, 87, 116, 130, 144, 173, 173,
14, 29, 43, 58, 87, 116, 130, 144, 173, 173, /*2T2R*/ 29, 58, 87, 116, 173, 231, 260, 289, 347, 347,
22, 43, 65, 87, 130, 173, 195, 217, 260, 289, /*3T3R*/ 43, 87, 130, 173, 260, 347, 390, 433, 520, 578
29, 58, 87, 116, 173, 231, 260, 289, 347, 347 /*4T4R*/
} }
}, /* Short GI, 20MHz */ }, /* Short GI, 20MHz */
{ { { {
14, 27, 41, 54, 81, 108, 122, 135, 162, 180, /*1T1R*/ 27, 54, 81, 108, 162, 216, 243, 270, 324, 360,
27, 54, 81, 108, 162, 216, 243, 270, 324, 360,/*2T2R*/ 54, 108, 162, 216, 324, 432, 486, 540, 648, 720,
41, 81, 122, 162, 243, 324, 365, 405, 486, 540, /*3T3R*/ 81, 162, 243, 324, 486, 648, 729, 810, 972, 1080
54, 108, 162, 216, 324, 432, 486, 540, 648, 720 /*4T4R*/ }, /* Long GI, 40MHz */
}, /* Long GI, 40MHz */
{ {
15, 30, 45, 60, 90, 120, 135, 150, 180, 200, /*1T1R*/ 30, 60, 90, 120, 180, 240, 270, 300, 360, 400,
30, 60, 90, 120, 180, 240, 270, 300, 360, 400, /*2T2R*/ 60, 120, 180, 240, 360, 480, 540, 600, 720, 800,
40, 95, 135, 180, 270, 360, 405, 450, 540, 600, /*3T3R*/ 90, 180, 270, 360, 540, 720, 810, 900, 1080, 1200
60, 120, 180, 240, 360, 480, 540, 600, 720, 800 /*4T4R*/
} }
}, /* Short GI, 40MHz */ }, /* Short GI, 40MHz */
{ { { {
29, 59, 89, 117, 176, 234, 263, 293, 351, 390, /*1T1R*/ 59, 117, 176, 234, 351, 468, 527, 585, 702, 780,
59, 117, 176, 234, 351, 468, 527, 585, 702, 780,/*2T2R*/ 117, 234, 351, 468, 702, 936, 1053, 1170, 1404, 1560,
88, 176, 263, 351, 527, 702, 790, 878, 1053, 1170,/*3T3R*/ 176, 351, 527, 702, 1053, 1404, 1580, 1755, 2106, 2340
117, 234, 351, 468, 702, 936, 1053, 1170, 1404, 1560 /*4T4R*/
}, /* Long GI, 80MHz */ }, /* Long GI, 80MHz */
{ {
33, 65, 98, 130, 195, 260, 293, 325, 390, 433,/*1T1R*/ 65, 130, 195, 260, 390, 520, 585, 650, 780, 867,
65, 130, 195, 260, 390, 520, 585, 650, 780, 867, /*2T2R*/ 130, 260, 390, 520, 780, 1040, 1170, 1300, 1560, 1734,
98, 195, 293, 390, 585, 780, 878, 975, 1170, 1300, /*3T3R*/ 195, 390, 585, 780, 1170, 1560, 1755, 1950, 2340, 2600
130, 260, 390, 520, 780, 1040, 1170, 1300, 1560, 1733/*4T4R*/
} }
} /* Short GI, 80MHz */ } /* Short GI, 80MHz */
}; };

2
include/drv_types.h
View File

@ -245,7 +245,7 @@ struct registry_priv {
/* BIT1 - 40MHz, 1: support, 0: non-support */ /* BIT1 - 40MHz, 1: support, 0: non-support */
/* BIT2 - 80MHz, 1: support, 0: non-support */ /* BIT2 - 80MHz, 1: support, 0: non-support */
/* BIT3 - 160MHz, 1: support, 0: non-support */ /* BIT3 - 160MHz, 1: support, 0: non-support */
//u8 short_gi; u8 short_gi;
/* BIT0: Enable VHT LDPC Rx, BIT1: Enable VHT LDPC Tx, BIT4: Enable HT LDPC Rx, BIT5: Enable HT LDPC Tx */ /* BIT0: Enable VHT LDPC Rx, BIT1: Enable VHT LDPC Tx, BIT4: Enable HT LDPC Rx, BIT5: Enable HT LDPC Tx */
u8 ldpc_cap; u8 ldpc_cap;
/* BIT0: Enable VHT STBC Rx, BIT1: Enable VHT STBC Tx, BIT4: Enable HT STBC Rx, BIT5: Enable HT STBC Tx */ /* BIT0: Enable VHT STBC Rx, BIT1: Enable VHT STBC Tx, BIT4: Enable HT STBC Rx, BIT5: Enable HT STBC Tx */

6
include/ieee80211.h
View File

@ -1852,9 +1852,8 @@ enum rtw_ieee80211_wnm_actioncode {
#define WME_TSPEC_DIRECTION_DOWNLINK 1 #define WME_TSPEC_DIRECTION_DOWNLINK 1
#define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3 #define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3
#define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */ #define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */
#define OUI_ATHEROS 0x00037f /*Atheros*/
#define OUI_WFA 0x506f9a
#define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */ #define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */
@ -2029,7 +2028,6 @@ struct rtw_ieee802_11_elems {
u8 vht_operation_len; u8 vht_operation_len;
u8 *vht_op_mode_notify; u8 *vht_op_mode_notify;
u8 vht_op_mode_notify_len; u8 vht_op_mode_notify_len;
uint oui;
u8 *rm_en_cap; u8 *rm_en_cap;
u8 rm_en_cap_len; u8 rm_en_cap_len;
#ifdef CONFIG_RTW_MESH #ifdef CONFIG_RTW_MESH
@ -2176,7 +2174,7 @@ uint rtw_get_cckrate_size(u8 *rate,u32 rate_length);
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel); int rtw_check_network_type(unsigned char *rate, int ratelen, int channel);
u8 rtw_check_invalid_mac_address(u8 *mac_addr, u8 check_local_bit); u8 rtw_check_invalid_mac_address(u8 *mac_addr, u8 check_local_bit);
void rtw_macaddr_cfg(struct device *dev, u8 *out, const u8 *hw_mac_addr); void rtw_macaddr_cfg(u8 *out, const u8 *hw_mac_addr);
u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate); u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI, unsigned char *MCS_rate);
u8 rtw_ht_mcsset_to_nss(u8 *supp_mcs_set); u8 rtw_ht_mcsset_to_nss(u8 *supp_mcs_set);

5
include/rtl_autoconf.h
View File

@ -30,11 +30,6 @@
#define PLATFORM_LINUX #define PLATFORM_LINUX
/*
* Monitor function Config
*/
//#define CONFIG_RADIOTAP_WITH_RXDESC
/* #define CONFIG_IOCTL_CFG80211 1 */ /* #define CONFIG_IOCTL_CFG80211 1 */
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211

3
include/rtw_recv.h
View File

@ -188,9 +188,6 @@ struct rx_pkt_attrib {
u32 tsfl; u32 tsfl;
u32 MacIDValidEntry[2]; /* 64 bits present 64 entry. */ u32 MacIDValidEntry[2]; /* 64 bits present 64 entry. */
u8 ppdu_cnt; u8 ppdu_cnt;
#ifdef CONFIG_RADIOTAP_WITH_RXDESC
u8 rxdesc[RXDESC_SIZE];
#endif
u32 free_cnt; /* free run counter */ u32 free_cnt; /* free run counter */
struct phydm_phyinfo_struct phy_info; struct phydm_phyinfo_struct phy_info;

96
os_dep/linux/ioctl_cfg80211.c
View File

@ -2328,6 +2328,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
//sinfo->txrate.flags |= NL80211_RATE_INFO_VHT_NSS; //sinfo->txrate.flags |= NL80211_RATE_INFO_VHT_NSS;
//sinfo->txrate.nss = rtw_vht_mcsmap_to_nss(psta->vhtpriv.vht_mcs_map); //sinfo->txrate.nss = rtw_vht_mcsmap_to_nss(psta->vhtpriv.vht_mcs_map);
/* bw_mode is more delicate /* bw_mode is more delicate
sinfo->txrate.bw is flagged sinfo->txrate.bw is flagged
psta->bw_mode */ psta->bw_mode */
@ -2370,9 +2371,10 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
/* is this actually the dtim_period? */ /* is this actually the dtim_period? */
sinfo->bss_param.flags |= STATION_INFO_BSS_PARAM_DTIM_PERIOD; sinfo->bss_param.flags |= STATION_INFO_BSS_PARAM_DTIM_PERIOD;
sinfo->bss_param.dtim_period = pwrctl->dtim; //sinfo->bss_param.dtim_period = pwrctl->dtim;
sinfo->bss_param.beacon_interval = get_beacon_interval(wlan_network->network); // kimocoder: this one below needs attention
//sinfo->bss_param.beacon_interval = get_beacon_interval(wlan_network->network);
#endif #endif
@ -2423,7 +2425,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
NDIS_802_11_NETWORK_INFRASTRUCTURE networkType; NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct wireless_dev *rtw_wdev = padapter->rtw_wdev; struct wireless_dev *rtw_wdev = padapter->rtw_wdev;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
u8 is_p2p = _FALSE; u8 is_p2p = _FALSE;
@ -2441,6 +2443,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
goto exit; goto exit;
} }
RTW_INFO(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev));
if (netdev_open(ndev) != 0) { if (netdev_open(ndev) != 0) {
RTW_INFO(FUNC_NDEV_FMT" call netdev_open fail\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT" call netdev_open fail\n", FUNC_NDEV_ARG(ndev));
@ -2448,6 +2451,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
goto exit; goto exit;
} }
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (_FAIL == rtw_pwr_wakeup(padapter)) {
RTW_INFO(FUNC_NDEV_FMT" call rtw_pwr_wakeup fail\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT" call rtw_pwr_wakeup fail\n", FUNC_NDEV_ARG(ndev));
ret = -EPERM; ret = -EPERM;
@ -6123,11 +6127,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
RTW_INFO(FUNC_ADPT_FMT" ch:%d bw:%d, offset:%d\n" RTW_INFO(FUNC_ADPT_FMT" ch:%d bw:%d, offset:%d\n"
, FUNC_ADPT_ARG(padapter), chan_target, chan_width, chan_offset); , FUNC_ADPT_ARG(padapter), chan_target, chan_width, chan_offset);
padapter->mlmeextpriv.cur_channel = target_channel;
rtw_ps_deny(padapter, PS_DENY_IOCTL);
//LeaveAllPowerSaveModeDirect(padapter); /* leave PS mode for guaranteeing to access hw register successfully */
rtw_set_chbw_cmd(padapter, chan_target, chan_width, chan_offset, RTW_CMDF_WAIT_ACK); rtw_set_chbw_cmd(padapter, chan_target, chan_width, chan_offset, RTW_CMDF_WAIT_ACK);
rtw_ps_deny_cancel(padapter, PS_DENY_IOCTL);
return 0; return 0;
} }
@ -6227,10 +6227,7 @@ static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
RTW_INFO(FUNC_ADPT_FMT" ch:%d bw:%d, offset:%d\n" RTW_INFO(FUNC_ADPT_FMT" ch:%d bw:%d, offset:%d\n"
, FUNC_ADPT_ARG(padapter), target_channal, target_width, target_offset); , FUNC_ADPT_ARG(padapter), target_channal, target_width, target_offset);
padapter->mlmeextpriv.cur_channel = target_channel;
rtw_ps_deny(padapter, PS_DENY_IOCTL);
rtw_set_chbw_cmd(padapter, target_channal, target_width, target_offset, RTW_CMDF_WAIT_ACK); rtw_set_chbw_cmd(padapter, target_channal, target_width, target_offset, RTW_CMDF_WAIT_ACK);
rtw_ps_deny_cancel(padapter, PS_DENY_IOCTL);
return 0; return 0;
} }
@ -9535,15 +9532,12 @@ static void rtw_cfg80211_init_vht_capab_ex(_adapter *padapter, struct ieee80211_
{ {
//todo: Support for other bandwidths //todo: Support for other bandwidths
/* NSS = Number of Spatial Streams */ /* NSS = Number of Spatial Streams */
//#define MAX_BIT_RATE_80MHZ_NSS3 1300 /* Mbps */ #define MAX_BIT_RATE_80MHZ_NSS3 1300 /* Mbps */
//#define MAX_BIT_RATE_80MHZ_NSS2 867 /* Mbps */ #define MAX_BIT_RATE_80MHZ_NSS2 867 /* Mbps */
//#define MAX_BIT_RATE_80MHZ_NSS1 433 /* Mbps */ #define MAX_BIT_RATE_80MHZ_NSS1 434 /* Mbps */
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct vht_priv *pvhtpriv = &pmlmepriv->vhtpriv; struct vht_priv *pvhtpriv = &pmlmepriv->vhtpriv;
u32 rx_packet_offset, max_recvbuf_sz;
u16 HighestRate;
u8 bw, rf_num;
rtw_vht_use_default_setting(padapter); rtw_vht_use_default_setting(padapter);
/* RX LDPC */ /* RX LDPC */
if (TEST_FLAG(pvhtpriv->ldpc_cap, LDPC_VHT_ENABLE_RX)) if (TEST_FLAG(pvhtpriv->ldpc_cap, LDPC_VHT_ENABLE_RX))
@ -9551,10 +9545,6 @@ static void rtw_cfg80211_init_vht_capab_ex(_adapter *padapter, struct ieee80211_
/* TX STBC */ /* TX STBC */
if (TEST_FLAG(pvhtpriv->stbc_cap, STBC_VHT_ENABLE_TX)) if (TEST_FLAG(pvhtpriv->stbc_cap, STBC_VHT_ENABLE_TX))
vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC; vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;
if (pvhtpriv->sgi_80m)
vht_cap->cap |= IEEE80211_VHT_CAP_SHORT_GI_80;
/* RX STBC */ /* RX STBC */
if (TEST_FLAG(pvhtpriv->stbc_cap, STBC_VHT_ENABLE_RX)) { if (TEST_FLAG(pvhtpriv->stbc_cap, STBC_VHT_ENABLE_RX)) {
switch (rf_type) { switch (rf_type) {
@ -9598,67 +9588,13 @@ static void rtw_cfg80211_init_vht_capab_ex(_adapter *padapter, struct ieee80211_
/* MCS map */ /* MCS map */
vht_cap->vht_mcs.tx_mcs_map = pvhtpriv->vht_mcs_map[0] | (pvhtpriv->vht_mcs_map[1] << 8); vht_cap->vht_mcs.tx_mcs_map = pvhtpriv->vht_mcs_map[0] | (pvhtpriv->vht_mcs_map[1] << 8);
vht_cap->vht_mcs.rx_mcs_map = vht_cap->vht_mcs.tx_mcs_map; vht_cap->vht_mcs.rx_mcs_map = vht_cap->vht_mcs.tx_mcs_map;
/* B0 B1 Maximum MPDU Length */ if (rf_type == RF_1T1R) {
rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); vht_cap->vht_mcs.tx_highest = MAX_BIT_RATE_80MHZ_NSS1;
rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); vht_cap->vht_mcs.rx_highest = MAX_BIT_RATE_80MHZ_NSS1;
if ((max_recvbuf_sz - rx_packet_offset) >= 11454) {
vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;
} else if ((max_recvbuf_sz - rx_packet_offset) >= 7991) {
vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;
} else if ((max_recvbuf_sz - rx_packet_offset) >= 3895) {
vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895;
} }
/* B2 B3 Supported Channel Width Set */ if (pvhtpriv->sgi_80m)
if (hal_chk_bw_cap(padapter, BW_CAP_160M) && REGSTY_IS_BW_5G_SUPPORT(pregistrypriv, CHANNEL_WIDTH_160)) { vht_cap->cap |= IEEE80211_VHT_CAP_SHORT_GI_80;
if (hal_chk_bw_cap(padapter, BW_CAP_80_80M) && REGSTY_IS_BW_5G_SUPPORT(pregistrypriv, CHANNEL_WIDTH_80_80)) vht_cap->cap |= (pvhtpriv->ampdu_len << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);
vht_cap->cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
else
vht_cap->cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
}
#ifdef CONFIG_BEAMFORMING
/* B11 SU Beamformer Capable */
if (TEST_FLAG(pvhtpriv->beamform_cap, BEAMFORMING_VHT_BEAMFORMER_ENABLE)) {
vht_cap->cap |= IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE;
/* B16 17 18 Number of Sounding Dimensions */
rtw_hal_get_def_var(padapter, HAL_DEF_BEAMFORMER_CAP, (u8 *)&rf_num);
vht_cap->cap |= rf_num << IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT;
/* B19 MU Beamformer Capable */
if (TEST_FLAG(pvhtpriv->beamform_cap, BEAMFORMING_VHT_MU_MIMO_AP_ENABLE))
vht_cap->cap |= IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE;
}
/* B12 SU Beamformee Capable */
if (TEST_FLAG(pvhtpriv->beamform_cap, BEAMFORMING_VHT_BEAMFORMEE_ENABLE)) {
vht_cap->cap |= IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
// B13 14 15 Compressed Steering Number of Beamformer Antennas Supported
rtw_hal_get_def_var(padapter, HAL_DEF_BEAMFORMEE_CAP, (u8 *)&rf_num);
vht_cap->cap |= rf_num << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT;
/* B20 MU Beamformee Capable */
if (TEST_FLAG(pvhtpriv->beamform_cap, BEAMFORMING_VHT_MU_MIMO_STA_ENABLE))
vht_cap->cap |= IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
}
#endif
/* B22 +HTC-VHT Capable */
vht_cap->cap |= IEEE80211_VHT_CAP_HTC_VHT;
/* B23 24 25 Maximum A-MPDU Length Exponent */
if (pregistrypriv->ampdu_factor != 0xFE)
vht_cap->cap |= pregistrypriv->ampdu_factor << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
else
vht_cap->cap |= 7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
/* B26 27 VHT Link Adaptation Capable */
/* find the largest bw supported by both registry and hal */
/* this is taken from core/rtw_vht.c */
bw = hal_largest_bw(padapter, REGSTY_BW_5G(pregistrypriv));
HighestRate = rtw_vht_mcs_to_data_rate(bw, pvhtpriv->sgi_80m, pvhtpriv->vht_highest_rate);
vht_cap->vht_mcs.tx_highest = HighestRate;
vht_cap->vht_mcs.rx_highest = HighestRate;
return;
} }
void rtw_cfg80211_init_wiphy(_adapter *padapter) void rtw_cfg80211_init_wiphy(_adapter *padapter)

4
os_dep/linux/os_intfs.c
View File

@ -222,7 +222,7 @@ MODULE_PARM_DESC(rtw_rx_ampdu_sz_limit_4ss, "RX AMPDU size limit for 4SS link of
* BIT1 - 40MHz, 0: non-support, 1: support * BIT1 - 40MHz, 0: non-support, 1: support
* BIT2 - 80MHz, 0: non-support, 1: support * BIT2 - 80MHz, 0: non-support, 1: support
* BIT3 - 160MHz, 0: non-support, 1: support */ * BIT3 - 160MHz, 0: non-support, 1: support */
//int rtw_short_gi = 0xf; int rtw_short_gi = 0xf;
/* BIT0: Enable VHT LDPC Rx, BIT1: Enable VHT LDPC Tx, BIT4: Enable HT LDPC Rx, BIT5: Enable HT LDPC Tx */ /* BIT0: Enable VHT LDPC Rx, BIT1: Enable VHT LDPC Tx, BIT4: Enable HT LDPC Rx, BIT5: Enable HT LDPC Tx */
int rtw_ldpc_cap = 0x33; int rtw_ldpc_cap = 0x33;
/* BIT0: Enable VHT STBC Rx, BIT1: Enable VHT STBC Tx, BIT4: Enable HT STBC Rx, BIT5: Enable HT STBC Tx */ /* BIT0: Enable VHT STBC Rx, BIT1: Enable VHT STBC Tx, BIT4: Enable HT STBC Rx, BIT5: Enable HT STBC Tx */
@ -965,7 +965,7 @@ uint loadparam(_adapter *padapter)
registry_par->rx_stbc = (u8)rtw_rx_stbc; registry_par->rx_stbc = (u8)rtw_rx_stbc;
registry_par->rx_ampdu_amsdu = (u8)rtw_rx_ampdu_amsdu; registry_par->rx_ampdu_amsdu = (u8)rtw_rx_ampdu_amsdu;
registry_par->tx_ampdu_amsdu = (u8)rtw_tx_ampdu_amsdu; registry_par->tx_ampdu_amsdu = (u8)rtw_tx_ampdu_amsdu;
//registry_par->short_gi = (u8)rtw_short_gi; registry_par->short_gi = (u8)rtw_short_gi;
registry_par->ldpc_cap = (u8)rtw_ldpc_cap; registry_par->ldpc_cap = (u8)rtw_ldpc_cap;
#if defined(CONFIG_CUSTOMER01_SMART_ANTENNA) #if defined(CONFIG_CUSTOMER01_SMART_ANTENNA)
rtw_stbc_cap = 0x0; rtw_stbc_cap = 0x0;

5180
os_dep/linux/os_intfs.c.orig Normal file
View File

File diff suppressed because it is too large Load Diff

3
os_dep/linux/recv_linux.c
View File

@ -619,8 +619,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
skb->pkt_type = PACKET_OTHERHOST; skb->pkt_type = PACKET_OTHERHOST;
/* skb->protocol = __constant_htons(0x0019); ETH_P_80211_RAW */ /* skb->protocol = __constant_htons(0x0019); ETH_P_80211_RAW */
// skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/ skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/
skb->protocol = htons(ETH_P_802_2); /* ETH_P_80211_RAW */
/* RTW_INFO("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len); */ /* RTW_INFO("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len); */