]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Clean up l2cap_chan_add
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Mon, 6 Feb 2012 13:04:00 +0000 (15:04 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:35 +0000 (17:01 +0200)
Change elseif to switch. This make sense even more with following
patches which otherwise have to add more elseifs statements.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
net/bluetooth/l2cap_core.c

index 80fbfcf0674d362b68ed7e0d7fb3653cb2b27b1c..48fc01ef16b6acc111ed3dc288bb1fbc3d717a6c 100644 (file)
@@ -320,7 +320,8 @@ static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
 
        chan->conn = conn;
 
-       if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED) {
+       switch (chan->chan_type) {
+       case L2CAP_CHAN_CONN_ORIENTED:
                if (conn->hcon->type == LE_LINK) {
                        /* LE connection */
                        chan->omtu = L2CAP_LE_DEFAULT_MTU;
@@ -331,12 +332,16 @@ static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
                        chan->scid = l2cap_alloc_cid(conn);
                        chan->omtu = L2CAP_DEFAULT_MTU;
                }
-       } else if (chan->chan_type == L2CAP_CHAN_CONN_LESS) {
+               break;
+
+       case L2CAP_CHAN_CONN_LESS:
                /* Connectionless socket */
                chan->scid = L2CAP_CID_CONN_LESS;
                chan->dcid = L2CAP_CID_CONN_LESS;
                chan->omtu = L2CAP_DEFAULT_MTU;
-       } else {
+               break;
+
+       default:
                /* Raw socket can send/recv signalling messages only */
                chan->scid = L2CAP_CID_SIGNALING;
                chan->dcid = L2CAP_CID_SIGNALING;