diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-13 05:10:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-13 05:10:20 -0700 |
| commit | a8e1019435d2b5a334066b47252fec850b35a2f8 (patch) | |
| tree | 8bcd95296be2b4e3dd887fa59b4bb1e0b76e8bc1 /include | |
| parent | 903d1fe4c9e49193d12de60e0c5d11b7abd2271b (diff) | |
| parent | b1c8ea3cff078b9c96be75bc244cd9b5c9d55b71 (diff) | |
Merge bk://linux-bt.bkbits.net/bt-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 8 | ||||
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index cd9ab609d354..3758bc57d7b8 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -231,8 +231,10 @@ struct l2cap_pinfo { struct sock *prev_c; }; -#define CONF_REQ_SENT 0x01 -#define CONF_INPUT_DONE 0x02 -#define CONF_OUTPUT_DONE 0x04 +#define L2CAP_CONF_REQ_SENT 0x01 +#define L2CAP_CONF_INPUT_DONE 0x02 +#define L2CAP_CONF_OUTPUT_DONE 0x04 + +void l2cap_load(void); #endif /* __L2CAP_H */ diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index 2efdc72f4193..c2a2098b4369 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -185,10 +185,11 @@ struct rfcomm_dlc { atomic_t refcnt; u8 dlci; u8 addr; - - uint mtu; + u8 priority; u8 v24_sig; + u8 mscex; + uint mtu; uint credits; uint rx_credits; uint tx_credits; @@ -213,6 +214,11 @@ struct rfcomm_dlc { #define RFCOMM_SCHED_TIMEO 3 #define RFCOMM_SCHED_WAKEUP 31 +/* MSC exchange flags */ +#define RFCOMM_MSCEX_TX 1 +#define RFCOMM_MSCEX_RX 2 +#define RFCOMM_MSCEX_OK (RFCOMM_MSCEX_TX + RFCOMM_MSCEX_RX) + extern struct task_struct *rfcomm_thread; extern unsigned long rfcomm_event; |