Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[linux-2.6-microblaze.git] / net / bluetooth / l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index fe913a5..ade83e2 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -666,8 +666,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
 
                l2cap_seq_list_free(&chan->srej_list);
                l2cap_seq_list_free(&chan->retrans_list);
-
-               /* fall through */
+               fallthrough;
 
        case L2CAP_MODE_STREAMING:
                skb_queue_purge(&chan->tx_q);
@@ -872,7 +871,8 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
                        else
                                return HCI_AT_NO_BONDING;
                }
-               /* fall through */
+               fallthrough;
+
        default:
                switch (chan->sec_level) {
                case BT_SECURITY_HIGH:
@@ -2983,8 +2983,7 @@ static void l2cap_tx_state_wait_f(struct l2cap_chan *chan,
                break;
        case L2CAP_EV_RECV_REQSEQ_AND_FBIT:
                l2cap_process_reqseq(chan, control->reqseq);
-
-               /* Fall through */
+               fallthrough;
 
        case L2CAP_EV_RECV_FBIT:
                if (control && control->final) {
@@ -3311,7 +3310,7 @@ static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)
        case L2CAP_MODE_ERTM:
                if (l2cap_mode_supported(mode, remote_feat_mask))
                        return mode;
-               /* fall through */
+               fallthrough;
        default:
                return L2CAP_MODE_BASIC;
        }
@@ -3447,7 +3446,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data
                if (__l2cap_efs_supported(chan->conn))
                        set_bit(FLAG_EFS_ENABLE, &chan->flags);
 
-               /* fall through */
+               fallthrough;
        default:
                chan->mode = l2cap_select_mode(rfc.mode, chan->conn->feat_mask);
                break;
@@ -4539,7 +4538,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,
                                goto done;
                        break;
                }
-               /* fall through */
+               fallthrough;
 
        default:
                l2cap_chan_set_err(chan, ECONNRESET);
@@ -7719,7 +7718,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)
                        conn->mtu = hcon->hdev->le_mtu;
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
                conn->mtu = hcon->hdev->acl_mtu;
                break;
@@ -7841,7 +7840,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
        case L2CAP_MODE_STREAMING:
                if (!disable_ertm)
                        break;
-               /* fall through */
+               fallthrough;
        default:
                err = -EOPNOTSUPP;
                goto done;
@@ -7893,11 +7892,13 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                else
                        hcon = hci_connect_le_scan(hdev, dst, dst_type,
                                                   chan->sec_level,
-                                                  HCI_LE_CONN_TIMEOUT);
+                                                  HCI_LE_CONN_TIMEOUT,
+                                                  CONN_REASON_L2CAP_CHAN);
 
        } else {
                u8 auth_type = l2cap_get_auth_type(chan);
-               hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);
+               hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type,
+                                      CONN_REASON_L2CAP_CHAN);
        }
 
        if (IS_ERR(hcon)) {