Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-22 13:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file_path symbol conflict with Linux 4.3

Browse Source 
file_path is now something in kernel 4.3 that conflicts with this
version of the driver.

Work-around found here:
e2ca811346

See related issue for discussion about it:
https://github.com/hadess/rtl8723bs/issues/24
This commit is contained in:
Magnus Bergmark 2015-11-10 23:04:30 +01:00
parent 416453cadc
commit 89e79bf30a
No known key found for this signature in database
GPG Key ID: DB2D6BB84D8E0309
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hal/hal_com_phycfg.c
View File

@ -2575,7 +2575,7 @@ Hal_ChannelPlanToRegulation(
#ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
extern char *rtw_phy_file_path; extern char *rtw_phy_file_path;
char file_path[PATH_LENGTH_MAX]; char file_path_bs[PATH_LENGTH_MAX];
#define GetLineFromBuffer(buffer) strsep(&buffer, "\n") #define GetLineFromBuffer(buffer) strsep(&buffer, "\n")
@ -2597,11 +2597,11 @@ phy_ConfigMACWithParaFile(
if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL)) if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -2696,11 +2696,11 @@ phy_ConfigBBWithParaFile(
if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -3149,11 +3149,11 @@ phy_ConfigBBWithPgParaFile(
if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL)) if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -3212,11 +3212,11 @@ phy_ConfigBBWithMpParaFile(
if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL)) if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -3348,11 +3348,11 @@ PHY_ConfigRFWithParaFile(
if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -3626,11 +3626,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL)) if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@ -3995,11 +3995,11 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL)) if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(file_path_bs, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(file_path_bs) == _TRUE)
{ {
rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrive_from_file(file_path_bs, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;