diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-06 16:02:05 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-06 16:02:05 -0500 |
| commit | 5f779bbd472cdb2046ff8b672ad8c5b62b61cd19 (patch) | |
| tree | 151dc07e9a69dd48e38251ba88811490ca16969a /include/net/bluetooth/bluetooth.h | |
| parent | d7a4858c0fde8383f7aa494eda0fba6bef3f2fec (diff) | |
| parent | 5a13b09531420d230616bd524b68a5b0c23cd487 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 835f3b229b84..980e59f37d4f 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
| @@ -36,6 +36,11 @@ | |||
| 36 | #define PF_BLUETOOTH AF_BLUETOOTH | 36 | #define PF_BLUETOOTH AF_BLUETOOTH |
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | /* Bluetooth versions */ | ||
| 40 | #define BLUETOOTH_VER_1_1 1 | ||
| 41 | #define BLUETOOTH_VER_1_2 2 | ||
| 42 | #define BLUETOOTH_VER_2_0 3 | ||
| 43 | |||
| 39 | /* Reserv for core and drivers use */ | 44 | /* Reserv for core and drivers use */ |
| 40 | #define BT_SKB_RESERVE 8 | 45 | #define BT_SKB_RESERVE 8 |
| 41 | 46 | ||