[PATCH 1/2] Bluetooth: make L2CAP sockets to inherit parent's priority

[PATCH 1/2] Bluetooth: make L2CAP sockets to inherit parent's priority

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This makes priority set on a listen socket to be passed when accepting
new connections.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 net/bluetooth/l2cap_sock.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 664762e..5a5d2c6 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -968,6 +968,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
 		struct l2cap_chan *pchan = l2cap_pi(parent)->chan;
 
 		sk->sk_type = parent->sk_type;
+		sk->sk_priority = parent->sk_priority;
 		bt_sk(sk)->defer_setup = bt_sk(parent)->defer_setup;
 
 		chan->chan_type = pchan->chan_type;
-- 
1.7.6.4

[PATCH 2/2] Bluetooth: make RFCOMM sockets to inherit parent's priority

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This makes priority set on a listen socket to be passed when accepting
new connections.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 net/bluetooth/rfcomm/sock.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 40988e2..81d658d 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -260,6 +260,7 @@ static void rfcomm_sock_init(struct sock *sk, struct sock *parent)
 
 	if (parent) {
 		sk->sk_type = parent->sk_type;
+		sk->sk_priority = parent->sk_priority;
 		pi->dlc->defer_setup = bt_sk(parent)->defer_setup;
 
 		pi->sec_level = rfcomm_pi(parent)->sec_level;
-- 
1.7.6.4

Re: [PATCH 1/2] Bluetooth: make L2CAP sockets to inherit parent's priority

[Marcel Holtmann]

Hi Luiz,

> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This makes priority set on a listen socket to be passed when accepting
> new connections.

I am in general fine with this, but is this the expected behavior of
SO_PRIORITY from other socket types?

Regards

Marcel

Re: [PATCH 1/2] Bluetooth: make L2CAP sockets to inherit parent's priority

[Luiz Augusto von Dentz]

Hi Marcel,

On Fri, Nov 4, 2011 at 11:06 PM, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Luiz,
>
>> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>>
>> This makes priority set on a listen socket to be passed when accepting
>> new connections.
>
> I am in general fine with this, but is this the expected behavior of
> SO_PRIORITY from other socket types?

Apparently it is not inherited in other socket types, so I guess we
should not inherit. In this case I will fix l2test/rctest to use
setsockopt on accepted sockets, similar to what is done with
SO_LINGER.

-- 
Luiz Augusto von Dentz