Bluetooth: Adds set_default function in L2CAP setup
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Wed, 28 Mar 2012 13:31:25 +0000 (16:31 +0300)
committerGustavo Padovan <gustavo@padovan.org>
Wed, 9 May 2012 03:41:39 +0000 (00:41 -0300)
Some parameters in L2CAP chan are set to default similar way in
socket based channels and A2MP channels. Adds common function which
sets all defaults.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
include/net/bluetooth/l2cap.h
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c

index f6f0500bf3700fb9e52022ba8295c033abf36efd..c70e2cf107ffddfb82e21cd41ee0997ffe4d4573 100644 (file)
@@ -915,5 +915,6 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
                                                                u32 priority);
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
 int l2cap_chan_check_security(struct l2cap_chan *chan);
+void l2cap_chan_set_defaults(struct l2cap_chan *chan);
 
 #endif /* __L2CAP_H */
index a57d96afa245e78987a0a86df04abe69cb5c8926..2eac6184a231fa51d98a6becea143568de41a16c 100644 (file)
@@ -296,6 +296,17 @@ void l2cap_chan_destroy(struct l2cap_chan *chan)
        l2cap_chan_put(chan);
 }
 
+void l2cap_chan_set_defaults(struct l2cap_chan *chan)
+{
+       chan->fcs  = L2CAP_FCS_CRC16;
+       chan->max_tx = L2CAP_DEFAULT_MAX_TX;
+       chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
+       chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;
+       chan->sec_level = BT_SECURITY_LOW;
+
+       set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
+}
+
 static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
 {
        BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,
index 1d3e9c328a368dc29efd1a93a9ad6cc3b952e50b..ae1d78ee0410aa16efc3768a0295a42fda5078fd 100644 (file)
@@ -1006,12 +1006,8 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                } else {
                        chan->mode = L2CAP_MODE_BASIC;
                }
-               chan->max_tx = L2CAP_DEFAULT_MAX_TX;
-               chan->fcs  = L2CAP_FCS_CRC16;
-               chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
-               chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;
-               chan->sec_level = BT_SECURITY_LOW;
-               set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
+
+               l2cap_chan_set_defaults(chan);
        }
 
        /* Default config options */