diff options
author | Andrei Emeltchenko | 2012-11-01 14:37:03 +0100 |
---|---|---|
committer | Gustavo Padovan | 2012-11-01 23:27:11 +0100 |
commit | fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f (patch) | |
tree | 4669ea95e47533e8b39b0546daf0df7c325cae3e /include/net/bluetooth | |
parent | Bluetooth: Process Create Chan Request (diff) | |
download | kernel-qcow2-linux-fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f.tar.gz kernel-qcow2-linux-fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f.tar.xz kernel-qcow2-linux-fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f.zip |
Bluetooth: Rename ctrl_id to remote_amp_id
Since we have started to use local_amp_id for local AMP
Controller Id it makes sense to rename ctrl_id to remote_amp_id
since it represents remote AMP controller Id.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 18149c8b4d1d..d65db459c843 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -481,6 +481,7 @@ struct l2cap_chan { unsigned long conn_state; unsigned long flags; + __u8 remote_amp_id; __u8 local_amp_id; __u8 move_id; __u8 move_state; @@ -518,8 +519,6 @@ struct l2cap_chan { __u32 remote_acc_lat; __u32 remote_flush_to; - __u8 ctrl_id; - struct delayed_work chan_timer; struct delayed_work retrans_timer; struct delayed_work monitor_timer; |