Bluetooth: Fix switch statement order for L2CAP fixed channels
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/1 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 <[email protected]>
--- net/bluetooth/l2cap_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/bluetooth/l2cap_core.c +4 -3
@@ -6466,9 +6466,6 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("len %d, cid 0x%4.4x" , len, cid);switch (cid) { -case L2CAP_CID_LE_SIGNALING : -l2cap_le_sig_channel (conn, skb); -break ;case L2CAP_CID_SIGNALING :l2cap_sig_channel (conn, skb);break ;
@@ -6483,6 +6480,10 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)l2cap_att_channel (conn, skb);break ; +case L2CAP_CID_LE_SIGNALING : +l2cap_le_sig_channel (conn, skb); +break ; +case L2CAP_CID_SMP :if (smp_sig_channel (conn, skb))l2cap_conn_del (conn->hcon,EACCES );
Signature · 1 line
1.8.3.1
Johan Hedberg
AppliedHi Marcel,
Quoted 7 lines · Marcel Holtmann
The switch statement for the various L2CAP fixed channel handlers is not really ordered.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/l2cap_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Applied to bluetooth-next. Thanks.
Johan