diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-14 17:39:31 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-19 19:30:35 -0200 |
| commit | 12d6cc60f2d02d5754ca662b414f8f96200b14a6 (patch) | |
| tree | 266bb1ef52f35d67bd7439c61d15864dcb608528 /net | |
| parent | a514b17fab51c1433db920d76cf8ddda959e5da0 (diff) | |
| download | linux-12d6cc60f2d02d5754ca662b414f8f96200b14a6.tar.bz2 | |
Bluetooth: Disable FCS only for new HS channels
Set chan->fcs to L2CAP_FCS_NONE only for new L2CAP channels
(not moved). Other side can still request to use FCS.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/amp.c | 1 | ||||
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index eaf473ffeef9..0258b2645edb 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c @@ -392,7 +392,6 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon) bredr_chan->remote_amp_id = hs_hcon->remote_id; bredr_chan->hs_hcon = hs_hcon; bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu; - bredr_chan->fcs = L2CAP_FCS_NONE; __l2cap_physical_cfm(bredr_chan, 0); diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 22c4ef926b0d..fc92fe341115 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4517,6 +4517,8 @@ void l2cap_move_start(struct l2cap_chan *chan) static void l2cap_do_create(struct l2cap_chan *chan, int result, u8 local_amp_id, u8 remote_amp_id) { + chan->fcs = L2CAP_FCS_NONE; + if (!test_bit(CONF_CONNECT_PEND, &chan->conf_state)) { struct l2cap_conn_rsp rsp; char buf[128]; |