[PATCH] rtlwifi: rtl8723be: Fix bug in ant_sel code from commit c18d8f509571

[PATCH] rtlwifi: rtl8723be: Fix bug in ant_sel code from commit c18d8f509571

[Larry Finger]

From: Ping-Ke Shih <pkshih@realtek.com>

In commit c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module
parameter"), wifi was fixed for those laptops that have only a single
antenna but have an incorrectly coded EEPROM. This error causes the
driver to select the wrong antenna. In that commit, one necessary change
that affects Bluetooth operation was missed.

Fixes: c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module parameter")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
---
 drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
index aba60c3..cb046ec 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
@@ -2664,9 +2664,12 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
 	}
 
 	/* override ant_num / ant_path */
-	if (mod_params->ant_sel)
+	if (mod_params->ant_sel) {
 		rtlpriv->btcoexist.btc_info.ant_num =
 			(mod_params->ant_sel == 1 ? ANT_X2 : ANT_X1);
+		rtlpriv->btcoexist.btc_info.single_ant_path =
+			(mod_params->ant_sel == 1 ? 0 : 1);
+	}
 }
 
 void rtl8723be_bt_reg_init(struct ieee80211_hw *hw)
-- 
2.10.0

Re: [PATCH] rtlwifi: rtl8723be: Fix bug in ant_sel code from commit c18d8f509571

[Larry Finger]

On 11/17/2016 12:05 PM, Larry Finger wrote:
> From: Ping-Ke Shih <pkshih@realtek.com>
>
> In commit c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module
> parameter"), wifi was fixed for those laptops that have only a single
> antenna but have an incorrectly coded EEPROM. This error causes the
> driver to select the wrong antenna. In that commit, one necessary change
> that affects Bluetooth operation was missed.
>
> Fixes: c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module parameter")
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Stable <stable@vger.kernel.org>
> ---
>  drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
> index aba60c3..cb046ec 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
> @@ -2664,9 +2664,12 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
>  	}
>
>  	/* override ant_num / ant_path */
> -	if (mod_params->ant_sel)
> +	if (mod_params->ant_sel) {
>  		rtlpriv->btcoexist.btc_info.ant_num =
>  			(mod_params->ant_sel == 1 ? ANT_X2 : ANT_X1);
> +		rtlpriv->btcoexist.btc_info.single_ant_path =
> +			(mod_params->ant_sel == 1 ? 0 : 1);
> +	}
>  }
>
>  void rtl8723be_bt_reg_init(struct ieee80211_hw *hw)
>

Please drop this patch. It contains an error.

Sorry,

Larry

Re: [PATCH] rtlwifi: rtl8723be: Fix bug in ant_sel code from commit c18d8f509571

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]

Hi Ping-Ke,

[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on v4.9-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Larry-Finger/rtlwifi-rtl8723be-Fix-bug-in-ant_sel-code-from-commit-c18d8f509571/20161118-024559
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 6.2.0
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=ia64 

All errors (new ones prefixed by >>):

   drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c: In function 'rtl8723be_read_bt_coexist_info_from_hwpg':
>> drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c:2670:30: error: 'struct rtl_btc_info' has no member named 'single_ant_path'
      rtlpriv->btcoexist.btc_info.single_ant_path =
                                 ^

vim +2670 drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c

  2664		}
  2665	
  2666		/* override ant_num / ant_path */
  2667		if (mod_params->ant_sel) {
  2668			rtlpriv->btcoexist.btc_info.ant_num =
  2669				(mod_params->ant_sel == 1 ? ANT_X2 : ANT_X1);
> 2670			rtlpriv->btcoexist.btc_info.single_ant_path =
  2671				(mod_params->ant_sel == 1 ? 0 : 1);
  2672		}
  2673	}

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 45106 bytes --]

Re: rtlwifi: rtl8723be: Fix bug in ant_sel code from commit c18d8f509571

[Kalle Valo]

Larry Finger <Larry.Finger@lwfinger.net> wrote:
> From: Ping-Ke Shih <pkshih@realtek.com>
> 
> In commit c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module
> parameter"), wifi was fixed for those laptops that have only a single
> antenna but have an incorrectly coded EEPROM. This error causes the
> driver to select the wrong antenna. In that commit, one necessary change
> that affects Bluetooth operation was missed.
> 
> Fixes: c18d8f509571 ("rtlwifi: rtl8723be: Add antenna select module parameter")
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Stable <stable@vger.kernel.org>

Requested by Larry

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/patch/9434985/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches