summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorJohn W. Linville2013-01-30 20:21:04 +0100
committerJohn W. Linville2013-01-30 20:21:04 +0100
commit0f496df2d9ba48faa808b5fa330de0da1a2d29d7 (patch)
treec1c85a625cff3f2ca6d95a5d5020a0157baa7521 /net/bluetooth/l2cap_core.c
parentMerge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentBluetooth: Add support for reading LE supported states (diff)
downloadkernel-qcow2-linux-0f496df2d9ba48faa808b5fa330de0da1a2d29d7.tar.gz
kernel-qcow2-linux-0f496df2d9ba48faa808b5fa330de0da1a2d29d7.tar.xz
kernel-qcow2-linux-0f496df2d9ba48faa808b5fa330de0da1a2d29d7.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 22e658322845..7c7e9321f1ea 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1527,17 +1527,12 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
BT_DBG("hcon %p conn %p hchan %p", hcon, conn, hchan);
switch (hcon->type) {
- case AMP_LINK:
- conn->mtu = hcon->hdev->block_mtu;
- break;
-
case LE_LINK:
if (hcon->hdev->le_mtu) {
conn->mtu = hcon->hdev->le_mtu;
break;
}
/* fall through */
-
default:
conn->mtu = hcon->hdev->acl_mtu;
break;