diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:34 -0400 |
| commit | ca424b2022410b6c2cd0bc0f9a0438ed0b75f95f (patch) | |
| tree | 3d3a06bdddc3940b06241095a1ae5c7072080d98 /include/net/bluetooth/bluetooth.h | |
| parent | 5c4d5e816c2cc86e17d09677b649be47fbc30e51 (diff) | |
| parent | 6fea7ad1d338dba592d65423427a997f1b7ff485 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 904777c1cd2..373000de610 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -260,15 +260,15 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock); /* Skb helpers */ struct l2cap_ctrl { - unsigned int sframe:1, - poll:1, - final:1, - fcs:1, - sar:2, - super:2; - __u16 reqseq; - __u16 txseq; - __u8 retries; + __u8 sframe:1, + poll:1, + final:1, + fcs:1, + sar:2, + super:2; + __u16 reqseq; + __u16 txseq; + __u8 retries; }; struct hci_dev; |