aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth/hci_core.h
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-11-17 13:52:20 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-11-17 19:53:15 -0500
commit38da1703060a520e69b00405f9bdf765d1396cd0 (patch)
tree40ecf418532711b858635ae05431ba7819d97195 /include/net/bluetooth/hci_core.h
parentc19a495c8bccc15acd299f26d72b5d51eb3acb1d (diff)
Bluetooth: Use shorter "rand" name for "randomizer"
The common short form of "randomizer" is "rand" in many places (including the Bluetooth specification). The shorter version also makes for easier to read code with less forced line breaks. This patch renames all occurences of "randomizer" to "rand" in the Bluetooth subsystem code. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
-rw-r--r--include/net/bluetooth/hci_core.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index fe2d5f299e12..a805b3d97c0b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -140,9 +140,9 @@ struct oob_data {
140 struct list_head list; 140 struct list_head list;
141 bdaddr_t bdaddr; 141 bdaddr_t bdaddr;
142 u8 hash192[16]; 142 u8 hash192[16];
143 u8 randomizer192[16]; 143 u8 rand192[16];
144 u8 hash256[16]; 144 u8 hash256[16];
145 u8 randomizer256[16]; 145 u8 rand256[16];
146}; 146};
147 147
148#define HCI_MAX_SHORT_NAME_LENGTH 10 148#define HCI_MAX_SHORT_NAME_LENGTH 10
@@ -943,10 +943,10 @@ void hci_remote_oob_data_clear(struct hci_dev *hdev);
943struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev, 943struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,
944 bdaddr_t *bdaddr); 944 bdaddr_t *bdaddr);
945int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, 945int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
946 u8 *hash, u8 *randomizer); 946 u8 *hash, u8 *rand);
947int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr, 947int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
948 u8 *hash192, u8 *randomizer192, 948 u8 *hash192, u8 *rand192,
949 u8 *hash256, u8 *randomizer256); 949 u8 *hash256, u8 *rand256);
950int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr); 950int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);
951 951
952void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb); 952void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
@@ -1374,8 +1374,8 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
1374 u8 status); 1374 u8 status);
1375void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status); 1375void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
1376void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192, 1376void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
1377 u8 *randomizer192, u8 *hash256, 1377 u8 *rand192, u8 *hash256, u8 *rand256,
1378 u8 *randomizer256, u8 status); 1378 u8 status);
1379void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 1379void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
1380 u8 addr_type, u8 *dev_class, s8 rssi, u32 flags, 1380 u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,
1381 u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len); 1381 u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len);