diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-03 02:46:54 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-03 03:07:29 -0400 |
commit | a28776296c7e3f2d0bb34e0e746968627fe588e8 (patch) | |
tree | 50c6341a42fc15303a8d2be800805c2d2a4b8d21 | |
parent | 6203fc983457a19a1c4c491ab0e94b4c4c884fb9 (diff) |
Bluetooth: Fix switch statement order for L2CAP fixed channels
The switch statement for the various L2CAP fixed channel handlers
is not really ordered.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | net/bluetooth/l2cap_core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 814563d15476..0661ca693db5 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -6466,9 +6466,6 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb) | |||
6466 | BT_DBG("len %d, cid 0x%4.4x", len, cid); | 6466 | BT_DBG("len %d, cid 0x%4.4x", len, cid); |
6467 | 6467 | ||
6468 | switch (cid) { | 6468 | switch (cid) { |
6469 | case L2CAP_CID_LE_SIGNALING: | ||
6470 | l2cap_le_sig_channel(conn, skb); | ||
6471 | break; | ||
6472 | case L2CAP_CID_SIGNALING: | 6469 | case L2CAP_CID_SIGNALING: |
6473 | l2cap_sig_channel(conn, skb); | 6470 | l2cap_sig_channel(conn, skb); |
6474 | break; | 6471 | break; |
@@ -6483,6 +6480,10 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb) | |||
6483 | l2cap_att_channel(conn, skb); | 6480 | l2cap_att_channel(conn, skb); |
6484 | break; | 6481 | break; |
6485 | 6482 | ||
6483 | case L2CAP_CID_LE_SIGNALING: | ||
6484 | l2cap_le_sig_channel(conn, skb); | ||
6485 | break; | ||
6486 | |||
6486 | case L2CAP_CID_SMP: | 6487 | case L2CAP_CID_SMP: |
6487 | if (smp_sig_channel(conn, skb)) | 6488 | if (smp_sig_channel(conn, skb)) |
6488 | l2cap_conn_del(conn->hcon, EACCES); | 6489 | l2cap_conn_del(conn->hcon, EACCES); |