* [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static
@ 2012-01-23 9:06 Szymon Janc
2012-01-23 9:07 ` Marcel Holtmann
2012-01-23 10:50 ` Johan Hedberg
0 siblings, 2 replies; 4+ messages in thread
From: Szymon Janc @ 2012-01-23 9:06 UTC (permalink / raw)
To: linux-bluetooth; +Cc: kanak.gupta, Andrei Emeltchenko, Szymon Janc
It is not used outside of l2cap_core.c. Also l2cap_ertm_data_rcv is
only used after it is defined so there is no need for forward declaration.
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
---
net/bluetooth/l2cap_core.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index e42999c..979d5a5 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -73,8 +73,6 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data);
static void l2cap_send_disconn_req(struct l2cap_conn *conn,
struct l2cap_chan *chan, int err);
-static int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb);
-
/* ---- L2CAP channels ---- */
static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16 cid)
@@ -4139,7 +4137,7 @@ static inline int l2cap_data_channel_sframe(struct l2cap_chan *chan, u32 rx_cont
return 0;
}
-int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
+static int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
{
u32 control;
u16 req_seq;
--
on behalf of ST-Ericsson
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static
2012-01-23 9:06 [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static Szymon Janc
@ 2012-01-23 9:07 ` Marcel Holtmann
2012-01-23 9:16 ` Szymon Janc
2012-01-23 10:50 ` Johan Hedberg
1 sibling, 1 reply; 4+ messages in thread
From: Marcel Holtmann @ 2012-01-23 9:07 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, kanak.gupta, Andrei Emeltchenko
Hi Szymon,
> It is not used outside of l2cap_core.c. Also l2cap_ertm_data_rcv is
> only used after it is defined so there is no need for forward declaration.
>
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
> ---
> net/bluetooth/l2cap_core.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
I assume that you and Andrei agreed here. If not, he needs to speak up.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static
2012-01-23 9:07 ` Marcel Holtmann
@ 2012-01-23 9:16 ` Szymon Janc
0 siblings, 0 replies; 4+ messages in thread
From: Szymon Janc @ 2012-01-23 9:16 UTC (permalink / raw)
To: Marcel Holtmann
Cc: linux-bluetooth@vger.kernel.org, kanak.gupta@stericsson.com,
Andrei Emeltchenko
> Hi Szymon,
Hi,
> > It is not used outside of l2cap_core.c. Also l2cap_ertm_data_rcv is
> > only used after it is defined so there is no need for forward declaration.
> >
> > Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
> > ---
> > net/bluetooth/l2cap_core.c | 4 +---
> > 1 files changed, 1 insertions(+), 3 deletions(-)
>
> I assume that you and Andrei agreed here. If not, he needs to speak up.
Yeap, Andrei reworked a2mp patches and is fine with that change now:
http://www.spinics.net/lists/linux-bluetooth/msg20448.html
--
BR
Szymon Janc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static
2012-01-23 9:06 [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static Szymon Janc
2012-01-23 9:07 ` Marcel Holtmann
@ 2012-01-23 10:50 ` Johan Hedberg
1 sibling, 0 replies; 4+ messages in thread
From: Johan Hedberg @ 2012-01-23 10:50 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, kanak.gupta, Andrei Emeltchenko
Hi Szymon,
On Mon, Jan 23, 2012, Szymon Janc wrote:
> It is not used outside of l2cap_core.c. Also l2cap_ertm_data_rcv is
> only used after it is defined so there is no need for forward declaration.
>
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
> ---
> net/bluetooth/l2cap_core.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
Applied to my bluetooth-next tree. Thanks.
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-23 10:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-23 9:06 [PATCH v2] Bluetooth: Make l2cap_ertm_data_rcv static Szymon Janc
2012-01-23 9:07 ` Marcel Holtmann
2012-01-23 9:16 ` Szymon Janc
2012-01-23 10:50 ` Johan Hedberg
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).