Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4748fed2d1a2a7a816277754498b8aa70850e051

Authored by Johan Hedberg
Committed by Gustavo F. Padovan
1 parent 655fe6ece7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Bluetooth: Remove old_key_type from mgmt_ev_new_key 

User space shouldn't have any need for the old key type so remove it
from the corresponding Management interface event.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Showing 4 changed files with 7 additions and 8 deletions Side-by-side Diff

include/net/bluetooth/hci_core.h
Diff comments   View file @ 4748fed
... ... @@ -775,7 +775,7 @@
775 775 int mgmt_powered(u16 index, u8 powered);
776 776 int mgmt_discoverable(u16 index, u8 discoverable);
777 777 int mgmt_connectable(u16 index, u8 connectable);
778   -int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type);
  778 +int mgmt_new_key(u16 index, struct link_key *key);
779 779 int mgmt_connected(u16 index, bdaddr_t *bdaddr);
780 780 int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);
781 781 int mgmt_disconnect_failed(u16 index);
include/net/bluetooth/mgmt.h
Diff comments   View file @ 4748fed
... ... @@ -231,7 +231,6 @@
231 231 #define MGMT_EV_NEW_KEY 0x000A
232 232 struct mgmt_ev_new_key {
233 233 struct mgmt_key_info key;
234   - __u8 old_key_type;
235 234 } __packed;
236 235  
237 236 #define MGMT_EV_CONNECTED 0x000B
net/bluetooth/hci_core.c
Diff comments   View file @ 4748fed
... ... @@ -1097,14 +1097,15 @@
1097 1097  
1098 1098 bacpy(&key->bdaddr, bdaddr);
1099 1099 memcpy(key->val, val, 16);
1100   - key->type = type;
1101 1100 key->pin_len = pin_len;
1102 1101  
1103   - if (new_key)
1104   - mgmt_new_key(hdev->id, key, old_key_type);
1105   -
1106 1102 if (type == HCI_LK_CHANGED_COMBINATION)
1107 1103 key->type = old_key_type;
  1104 + else
  1105 + key->type = type;
  1106 +
  1107 + if (new_key)
  1108 + mgmt_new_key(hdev->id, key);
1108 1109  
1109 1110 return 0;
1110 1111 }
net/bluetooth/mgmt.c
Diff comments   View file @ 4748fed
... ... @@ -1858,7 +1858,7 @@
1858 1858 return ret;
1859 1859 }
1860 1860  
1861   -int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type)
  1861 +int mgmt_new_key(u16 index, struct link_key *key)
1862 1862 {
1863 1863 struct mgmt_ev_new_key ev;
1864 1864  
... ... @@ -1868,7 +1868,6 @@
1868 1868 ev.key.type = key->type;
1869 1869 memcpy(ev.key.val, key->val, 16);
1870 1870 ev.key.pin_len = key->pin_len;
1871   - ev.old_key_type = old_key_type;
1872 1871  
1873 1872 return mgmt_event(MGMT_EV_NEW_KEY, index, &ev, sizeof(ev), NULL);
1874 1873 }