git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
include
/
net
/
bluetooth
/
rfcomm.h
diff --git
a/include/net/bluetooth/rfcomm.h
b/include/net/bluetooth/rfcomm.h
index
89d743c
..
98ec7a3
100644
(file)
--- a/
include/net/bluetooth/rfcomm.h
+++ b/
include/net/bluetooth/rfcomm.h
@@
-124,7
+124,7
@@
struct rfcomm_pn {
u8 flow_ctrl;
u8 priority;
u8 ack_timer;
u8 flow_ctrl;
u8 priority;
u8 ack_timer;
-
u
16 mtu;
+
__le
16 mtu;
u8 max_retrans;
u8 credits;
} __attribute__ ((packed));
u8 max_retrans;
u8 credits;
} __attribute__ ((packed));
@@
-136,7
+136,7
@@
struct rfcomm_rpn {
u8 flow_ctrl;
u8 xon_char;
u8 xoff_char;
u8 flow_ctrl;
u8 xon_char;
u8 xoff_char;
-
u
16 param_mask;
+
__le
16 param_mask;
} __attribute__ ((packed));
struct rfcomm_rls {
} __attribute__ ((packed));
struct rfcomm_rls {
@@
-252,8
+252,8
@@
static inline void rfcomm_dlc_put(struct rfcomm_dlc *d)
rfcomm_dlc_free(d);
}
rfcomm_dlc_free(d);
}
-extern void
FASTCALL(__rfcomm_dlc_throttle(struct rfcomm_dlc *d)
);
-extern void
FASTCALL(__rfcomm_dlc_unthrottle(struct rfcomm_dlc *d)
);
+extern void
__rfcomm_dlc_throttle(struct rfcomm_dlc *d
);
+extern void
__rfcomm_dlc_unthrottle(struct rfcomm_dlc *d
);
static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d)
{
static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d)
{
@@
-323,6
+323,7
@@
int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc
#define RFCOMM_RELEASE_ONHUP 1
#define RFCOMM_HANGUP_NOW 2
#define RFCOMM_TTY_ATTACHED 3
#define RFCOMM_RELEASE_ONHUP 1
#define RFCOMM_HANGUP_NOW 2
#define RFCOMM_TTY_ATTACHED 3
+#define RFCOMM_TTY_RELEASED 4
struct rfcomm_dev_req {
s16 dev_id;
struct rfcomm_dev_req {
s16 dev_id;