mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bluetooth: __ variants of u8 and friends are not neccessary inside kernel 

bluetooth.h is not part of user API, so __ variants are not neccessary
here.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Pavel Machek 2016-10-05 22:51:42 +02:00 committed by Marcel Holtmann
parent 0b42f25d2f
commit 21fcf57271
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/net/bluetooth/bluetooth.h
View File

@ -197,7 +197,7 @@ typedef struct {
#define BDADDR_LE_PUBLIC 0x01
#define BDADDR_LE_RANDOM 0x02
static inline bool bdaddr_type_is_valid(__u8 type)
static inline bool bdaddr_type_is_valid(u8 type)
{
switch (type) {
case BDADDR_BREDR:
@ -209,7 +209,7 @@ static inline bool bdaddr_type_is_valid(__u8 type)
return false;
}
static inline bool bdaddr_type_is_le(__u8 type)
static inline bool bdaddr_type_is_le(u8 type)
{
switch (type) {
case BDADDR_LE_PUBLIC:
@ -279,15 +279,16 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
/* Skb helpers */
struct l2cap_ctrl {
__u8 sframe:1,
u8 sframe:1,
poll:1,
final:1,
fcs:1,
sar:2,
super:2;
__u16 reqseq;
__u16 txseq;
__u8 retries;
u16 reqseq;
u16 txseq;
u8 retries;
__le16 psm;
bdaddr_t bdaddr;
struct l2cap_chan *chan;
@ -303,7 +304,7 @@ typedef void (*hci_req_complete_skb_t)(struct hci_dev *hdev, u8 status,
#define HCI_REQ_SKB BIT(1)
struct hci_ctrl {
__u16 opcode;
u16 opcode;
u8 req_flags;
u8 req_event;
union {
@ -313,10 +314,10 @@ struct hci_ctrl {
};
struct bt_skb_cb {
__u8 pkt_type;
__u8 force_active;
__u16 expect;
__u8 incoming:1;
u8 pkt_type;
u8 force_active;
u16 expect;
u8 incoming:1;
union {
struct l2cap_ctrl l2cap;
struct hci_ctrl hci;
@ -366,7 +367,7 @@ out:
return NULL;
}
int bt_to_errno(__u16 code);
int bt_to_errno(u16 code);
void hci_sock_set_flag(struct sock *sk, int nr);
void hci_sock_clear_flag(struct sock *sk, int nr);