| Message ID | e2c2fe36c226529c99595370003d3cb1b7133c47.1646252285.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Bluetooth: Don't assign twice the same value | expand |
Hi Christophe, On Wed, Mar 2, 2022 at 12:18 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > data.pid is set twice with the same value. Remove one of these redundant > calls. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > 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 >
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 > <christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org> wrote: >> >> data.pid is set twice with the same value. Remove one of these redundant >> calls. >> >> Signed-off-by: Christophe JAILLET <christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org> >> --- >> 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 >> > >
Hi Christophe, On Wed, Mar 2, 2022 at 12:18 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > data.pid is set twice with the same value. Remove one of these redundant > calls. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > 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.
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;
data.pid is set twice with the same value. Remove one of these redundant calls. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- net/bluetooth/l2cap_core.c | 1 - 1 file changed, 1 deletion(-)