From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: David Miller <davem@davemloft.net>
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: pull request: wireless-next-2.6 2011-05-16-v2
Date: Tue, 17 May 2011 11:13:16 -0300 [thread overview]
Message-ID: <20110517141316.GA3138@joana> (raw)
In-Reply-To: <20110516.230835.989629139579226478.davem@davemloft.net>
* David Miller <davem@davemloft.net> [2011-05-16 23:08:35 -0400]:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Mon, 16 May 2011 20:08:09 -0400
>
> > I'm sorry, Dave! In my defense, I am on the verge of sickness and got
> > very little sleep last night... :-(
> >
> > I have corrected the problem and was sure to perform the correct build
> > test this time! :-)
>
> So these hunks made to net/bluetooth/l2cap_core.c:
>
> @@ -3745,11 +3758,14 @@ done:
> static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
> {
> struct sock *sk;
> + struct l2cap_chan *chan;
>
> - sk = l2cap_get_sock_by_psm(0, psm, conn->src);
> - if (!sk)
> + chan = l2cap_global_chan_by_psm(0, psm, conn->src);
> + if (!chan)
> goto drop;
>
> + sk = chan->sk;
> +
> bh_lock_sock(sk);
>
> BT_DBG("sk %p, len %d", sk, skb->len);
> @@ -3745,11 +3758,14 @@ done:
> static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
> {
> struct sock *sk;
> + struct l2cap_chan *chan;
>
> - sk = l2cap_get_sock_by_psm(0, psm, conn->src);
> - if (!sk)
> + chan = l2cap_global_chan_by_psm(0, psm, conn->src);
> + if (!chan)
> goto drop;
>
> + sk = chan->sk;
> +
> bh_lock_sock(sk);
>
> BT_DBG("sk %p, len %d", sk, skb->len);
>
> Doesn't generate the following warnings on your compiler?
>
> net/bluetooth/l2cap_core.c: In function ‘l2cap_recv_frame’:
> net/bluetooth/l2cap_core.c:3758:15: warning: ‘sk’ may be used uninitialized in this function
> net/bluetooth/l2cap_core.c:3758:15: note: ‘sk’ was declared here
> net/bluetooth/l2cap_core.c:3791:15: warning: ‘sk’ may be used uninitialized in this function
> net/bluetooth/l2cap_core.c:3791:15: note: ‘sk’ was declared here
>
I keep not seeing these warnings. I'll upgrade to gcc 4.6 and check this again.
padovan bluetooth-next-2.6 $ rm net/bluetooth/*.o net/bluetooth/*.ko
padovan bluetooth-next-2.6 $ make
CHK include/linux/version.h
CHK include/generated/utsrelease.h
UPD include/generated/utsrelease.h
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
UPD include/generated/compile.h
CC init/version.o
CC kernel/module.o
LD init/built-in.o
CC kernel/kexec.o
LD kernel/built-in.o
LD net/bluetooth/built-in.o
CC [M] net/bluetooth/af_bluetooth.o
CC [M] net/bluetooth/hci_core.o
CC [M] net/bluetooth/hci_conn.o
CC [M] net/bluetooth/hci_event.o
CC [M] net/bluetooth/mgmt.o
CC [M] net/bluetooth/hci_sock.o
CC [M] net/bluetooth/hci_sysfs.o
CC [M] net/bluetooth/lib.o
CC [M] net/bluetooth/l2cap_core.o
CC [M] net/bluetooth/l2cap_sock.o
CC [M] net/bluetooth/sco.o
LD [M] net/bluetooth/bluetooth.o
LD vmlinux.o
--
Gustavo F. Padovan
http://profusion.mobi
prev parent reply other threads:[~2011-05-17 14:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-16 21:13 pull request: wireless-next-2.6 2011-05-16 John W. Linville
[not found] ` <20110516211305.GG6551-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2011-05-16 21:27 ` David Miller
2011-05-17 0:08 ` pull request: wireless-next-2.6 2011-05-16-v2 John W. Linville
[not found] ` <20110517000809.GA2119-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2011-05-17 3:08 ` David Miller
2011-05-17 14:13 ` Gustavo F. Padovan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110517141316.GA3138@joana \
--to=padovan@profusion.mobi \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).