diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-14 02:45:34 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-14 14:21:06 +0300 |
| commit | bdc257830760a784370ae4ab2d682b252b983e77 (patch) | |
| tree | a74e5dd9b65b39310a6862146ebd9b74903004f7 /net/bluetooth/l2cap_sock.c | |
| parent | c56057557672b65c11e7f99c124670c2297743f0 (diff) | |
| download | op-kernel-dev-bdc257830760a784370ae4ab2d682b252b983e77.zip op-kernel-dev-bdc257830760a784370ae4ab2d682b252b983e77.tar.gz | |
Bluetooth: Introduce L2CAP channel flag for defer setup
The L2CAP core should not look into the socket flags to figure out the
setting of defer setup. So introduce a L2CAP channel flag that mirrors
the socket flag.
Since the defer setup option is only set in one place this becomes a
really easy thing to do.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index f1b462f..f5d9573 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -672,10 +672,13 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, break; } - if (opt) + if (opt) { set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); - else + set_bit(FLAG_DEFER_SETUP, &chan->flags); + } else { clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags); + clear_bit(FLAG_DEFER_SETUP, &chan->flags); + } break; case BT_FLUSHABLE: |
