diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-02 15:15:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-02 15:15:51 -0400 |
| commit | c125d5e846894043361c0c89c1140be8fd6600b7 (patch) | |
| tree | 8c613b696dc65b047ae6660e55abcd0c008be490 /include/net | |
| parent | 6a32e4f9dd9219261f8856f817e6655114cfec2f (diff) | |
| parent | 6b441fab28ea1cbbf3da75dcd1e7438e6cba704c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index d5eee2093b1e..e2e3ecad1008 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h | |||
| @@ -211,6 +211,7 @@ struct rfcomm_dlc { | |||
| 211 | #define RFCOMM_AUTH_ACCEPT 6 | 211 | #define RFCOMM_AUTH_ACCEPT 6 |
| 212 | #define RFCOMM_AUTH_REJECT 7 | 212 | #define RFCOMM_AUTH_REJECT 7 |
| 213 | #define RFCOMM_DEFER_SETUP 8 | 213 | #define RFCOMM_DEFER_SETUP 8 |
| 214 | #define RFCOMM_ENC_DROP 9 | ||
| 214 | 215 | ||
| 215 | /* Scheduling flags and events */ | 216 | /* Scheduling flags and events */ |
| 216 | #define RFCOMM_SCHED_WAKEUP 31 | 217 | #define RFCOMM_SCHED_WAKEUP 31 |