[PATCH 1/2] Bluetooth: Make l2cap_ertm_data_rcv static

[PATCH 1/2] Bluetooth: Make l2cap_ertm_data_rcv static

[Szymon Janc]

It is not used outside of l2cap_core.c.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
---
 net/bluetooth/l2cap_core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 0087db8..d66c368 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4139,7 +4139,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

[PATCH 2/2] Bluetooth: Remove not needed l2cap_ertm_data_rcv forward declaration

[Szymon Janc]

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 |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d66c368..003bd40 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)
-- 
on behalf of ST-Ericsson

Re: [PATCH 1/2] Bluetooth: Make l2cap_ertm_data_rcv static

[Andrei Emeltchenko]

Hi Szymon,

On Tue, Jan 17, 2012 at 11:42:30AM +0100, Szymon Janc wrote:
> It is not used outside of l2cap_core.c.

Actually I am going to use it outside of l2cap_core. I will send my
patches implementing A2MP without using kernel sockets soon.

Best regards 
Andrei Emeltchenko 

> 
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
> ---
>  net/bluetooth/l2cap_core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 0087db8..d66c368 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -4139,7 +4139,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;
> -- 

Re: [PATCH 1/2] Bluetooth: Make l2cap_ertm_data_rcv static

[Andrei Emeltchenko]

Hi Szymon,

On Tue, Jan 17, 2012 at 02:22:53PM +0200, Andrei Emeltchenko wrote:
> Hi Szymon,
> 
> On Tue, Jan 17, 2012 at 11:42:30AM +0100, Szymon Janc wrote:
> > It is not used outside of l2cap_core.c.
> 
> Actually I am going to use it outside of l2cap_core. I will send my
> patches implementing A2MP without using kernel sockets soon.

I reworked my code so that I do not call l2cap_ertm_data_rcv directly. So
the patches looks OK now though I would merge them together.

Best regards 
Andrei Emeltchenko