Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\))
Subject: Re: [BlueZ] monitor: Fix the incorrect vendor name
From:   Marcel Holtmann <marcel@holtmann.org>
In-Reply-To: <20210414043857.371176-1-hj.tedd.an@gmail.com>
Date:   Wed, 14 Apr 2021 12:08:32 +0200
Cc:     linux-bluetooth@vger.kernel.org
Content-Transfer-Encoding: 8BIT
Message-Id: <6D9FBA0A-3058-4C96-8CFD-6BE5B585DE8E@holtmann.org>
References: <tedd.an@intel.com> <20210414043857.371176-1-hj.tedd.an@gmail.com>
To:     Tedd Ho-Jeong An <hj.tedd.an@gmail.com>
Precedence: bulk

Hi Tedd,

> This patch fixes the vendor name is alwasy shown as "Microsoft" even
> though a different vendor.
> 
> < HCI Command: Microsoft Secure Send (0x3f|0x0009) plen 249
>        Type: Data fragment (0x01)
>> HCI Event: Command Complete (0x0e) plen 4
>      Microsoft Secure Send (0x3f|0x0009) ncmd 31
>        Status: Success (0x00)
> ---
> monitor/packet.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/monitor/packet.c b/monitor/packet.c
> index d729a01cc..91d2294ff 100644
> --- a/monitor/packet.c
> +++ b/monitor/packet.c
> @@ -9325,18 +9325,12 @@ static const char *get_supported_command(int bit)
> 
> static const char *current_vendor_str(void)
> {
> -	uint16_t manufacturer, msft_opcode;
> +	uint16_t manufacturer;
> 
> -	if (index_current < MAX_INDEX) {
> +	if (index_current < MAX_INDEX)
> 		manufacturer = index_list[index_current].manufacturer;
> -		msft_opcode = index_list[index_current].msft_opcode;
> -	} else {
> +	else
> 		manufacturer = fallback_manufacturer;
> -		msft_opcode = BT_HCI_CMD_NOP;
> -	}
> -
> -	if (msft_opcode != BT_HCI_CMD_NOP)
> -		return "Microsoft";

seems we have a bug here, but the fix can not be correct either. If we are running on Intel firmware and the Microsoft extension is used, it should show Microsoft and not Intel for the vendor commands.

Regards

Marcel