Skip to content
This repository has been archived by the owner on Jun 20, 2019. It is now read-only.

Commit

Permalink
rtl8723bs: Fix file_path conflict in kernel 4.2
Browse files Browse the repository at this point in the history 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
@lwfinger
lwfinger committed Jul 8, 2015
1 parent ffab19c commit e2ca811
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions hal/hal_com_phycfg.c
View file
Expand Up @@ -2252,7 +2252,7 @@ Hal_ChannelPlanToRegulation(

#ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE

static char file_path[PATH_MAX];
static char file_path_bs[PATH_MAX];

#define GetLineFromBuffer(buffer) strsep(&buffer, "\n")

Expand All @@ -2274,11 +2274,11 @@ phy_ConfigMACWithParaFile(

if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down Expand Up @@ -2373,11 +2373,11 @@ phy_ConfigBBWithParaFile(

if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down Expand Up @@ -2822,11 +2822,11 @@ phy_ConfigBBWithPgParaFile(

if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down Expand Up @@ -2902,11 +2902,11 @@ PHY_ConfigRFWithParaFile(

if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down Expand Up @@ -3173,11 +3173,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(

if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down Expand Up @@ -3521,11 +3521,11 @@ PHY_ConfigRFWithPowerLimitTableParaFile(

if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
{
rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
rtw_merge_string(file_path_bs, PATH_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)
{
rtStatus = _SUCCESS;
Expand Down

0 comments on commit e2ca811

Please sign in to comment.