Bluetooth: Don't assign twice the same value

Commit Message

Christophe JAILLET March 2, 2022, 8:18 p.m. UTC

data.pid is set twice with the same value. Remove one of these redundant
calls.

Signed-off-by: Christophe JAILLET <[e-mail]>
---
 net/bluetooth/l2cap_core.c | 1 -
 1 file changed, 1 deletion(-)

Comments

[e-mail] March 2, 2022, 9:11 p.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=619692

---Test result---

Test Summary:
CheckPatch                    PASS      0.72 seconds
GitLint                       PASS      0.42 seconds
SubjectPrefix                 PASS      0.26 seconds
BuildKernel                   PASS      38.87 seconds
BuildKernel32                 PASS      34.65 seconds
Incremental Build with patchesPASS      47.41 seconds
TestRunner: Setup             PASS      618.78 seconds
TestRunner: l2cap-tester      PASS      16.73 seconds
TestRunner: bnep-tester       PASS      7.50 seconds
TestRunner: mgmt-tester       PASS      128.99 seconds
TestRunner: rfcomm-tester     FAIL      9.62 seconds
TestRunner: sco-tester        PASS      9.64 seconds
TestRunner: smp-tester        PASS      9.54 seconds
TestRunner: userchan-tester   PASS      7.80 seconds

Details
##############################
Test: TestRunner: rfcomm-tester - FAIL - 9.62 seconds
Run test-runner with rfcomm-tester
Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0

Failed Test Cases
Basic RFCOMM Socket Client - Write 32k Success       Failed       0.224 seconds



---
Regards,
Linux Bluetooth

Luiz Augusto von Dentz March 2, 2022, 9:36 p.m. UTC | #2

Hi Christophe,

On Wed, Mar 2, 2022 at 12:18 PM Christophe JAILLET
<[e-mail]> wrote:
>
> data.pid is set twice with the same value. Remove one of these redundant
> calls.
>
> Signed-off-by: Christophe JAILLET <[e-mail]>
> ---
>  net/bluetooth/l2cap_core.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index e817ff0607a0..0d460cb7f965 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -1443,7 +1443,6 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan)
>         data.pdu.scid[0]     = cpu_to_le16(chan->scid);
>
>         chan->ident = l2cap_get_ident(conn);
> -       data.pid = chan->ops->get_peer_pid(chan);

Perhaps we should do if (!data->pid) then since afaik one can do
connect without bind.

>         data.count = 1;
>         data.chan = chan;
> --
> 2.32.0
>

Christophe JAILLET March 3, 2022, 5:48 a.m. UTC | #3

Le 02/03/2022 à 22:36, Luiz Augusto von Dentz a écrit :
> Hi Christophe,
> 
> On Wed, Mar 2, 2022 at 12:18 PM Christophe JAILLET
> <[e-mail]> wrote:
>>
>> data.pid is set twice with the same value. Remove one of these redundant
>> calls.
>>
>> Signed-off-by: Christophe JAILLET <[e-mail]>
>> ---
>>   net/bluetooth/l2cap_core.c | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
>> index e817ff0607a0..0d460cb7f965 100644
>> --- a/net/bluetooth/l2cap_core.c
>> +++ b/net/bluetooth/l2cap_core.c
>> @@ -1443,7 +1443,6 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan)
>>          data.pdu.scid[0]     = cpu_to_le16(chan->scid);
>>
>>          chan->ident = l2cap_get_ident(conn);
>> -       data.pid = chan->ops->get_peer_pid(chan);
> 
> Perhaps we should do if (!data->pid) then since afaik one can do
> connect without bind.

Not sure to follow you.
'data' is local to this function. data->pid is undefined at this point.


If your comment is about the end of the function that should be 
conditional, I don't know the bluetooth stack at all and can't have any 
opinion about it.

If it is relevant, s.o. else will need to provide a patch for it.

CJ

> 
>>          data.count = 1;
>>          data.chan = chan;
>> --
>> 2.32.0
>>
> 
>

Luiz Augusto von Dentz March 14, 2022, 10 p.m. UTC | #4

Hi Christophe,

On Wed, Mar 2, 2022 at 12:18 PM Christophe JAILLET
<[e-mail]> wrote:
>
> data.pid is set twice with the same value. Remove one of these redundant
> calls.
>
> Signed-off-by: Christophe JAILLET <[e-mail]>
> ---
>  net/bluetooth/l2cap_core.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index e817ff0607a0..0d460cb7f965 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -1443,7 +1443,6 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan)
>         data.pdu.scid[0]     = cpu_to_le16(chan->scid);
>
>         chan->ident = l2cap_get_ident(conn);
> -       data.pid = chan->ops->get_peer_pid(chan);
>
>         data.count = 1;
>         data.chan = chan;
> --
> 2.32.0
>
Applied, thanks.

Patch

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index e817ff0607a0..0d460cb7f965 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1443,7 +1443,6 @@  static void l2cap_ecred_connect(struct l2cap_chan *chan)
 	data.pdu.scid[0]     = cpu_to_le16(chan->scid);
 
 	chan->ident = l2cap_get_ident(conn);
-	data.pid = chan->ops->get_peer_pid(chan);
 
 	data.count = 1;
 	data.chan = chan;