diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-10-31 15:46:29 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-01 20:27:06 -0200 |
| commit | 770bfefa2cbe8f5911860fef1a68ea873a9bbdbe (patch) | |
| tree | 509895b7db44a3141a4470c5c63098dd288aa47c /net/bluetooth | |
| parent | 439f34acead5bb1679f194c2023f05b90dcb8b4c (diff) | |
| download | linux-3.10-770bfefa2cbe8f5911860fef1a68ea873a9bbdbe.tar.gz linux-3.10-770bfefa2cbe8f5911860fef1a68ea873a9bbdbe.tar.bz2 linux-3.10-770bfefa2cbe8f5911860fef1a68ea873a9bbdbe.zip | |
Bluetooth: Derive remote and local amp id from chan struct
l2cap_chan already keeps information about *_amp_id.
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/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d51741fb5a9..782e49c97e7 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4573,9 +4573,11 @@ static void l2cap_do_move_cancel(struct l2cap_chan *chan, int result) l2cap_ertm_send(chan); } -void l2cap_physical_cfm(struct l2cap_chan *chan, int result, u8 local_amp_id, - u8 remote_amp_id) +void l2cap_physical_cfm(struct l2cap_chan *chan, int result) { + u8 local_amp_id = chan->local_amp_id; + u8 remote_amp_id = chan->ctrl_id; + BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d", chan, result, local_amp_id, remote_amp_id); |