mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
This commit is contained in:
commit
de5144164f
16 changed files with 336 additions and 415 deletions
|
|
@ -171,4 +171,10 @@ static inline int skb_frags_no(struct sk_buff *skb)
|
|||
|
||||
int bt_err(__u16 code);
|
||||
|
||||
extern int hci_sock_init(void);
|
||||
extern int hci_sock_cleanup(void);
|
||||
|
||||
extern int bt_sysfs_init(void);
|
||||
extern void bt_sysfs_cleanup(void);
|
||||
|
||||
#endif /* __BLUETOOTH_H */
|
||||
|
|
|
|||
|
|
@ -275,9 +275,6 @@ static inline void rfcomm_session_hold(struct rfcomm_session *s)
|
|||
atomic_inc(&s->refcnt);
|
||||
}
|
||||
|
||||
/* ---- RFCOMM chechsum ---- */
|
||||
extern u8 rfcomm_crc_table[];
|
||||
|
||||
/* ---- RFCOMM sockets ---- */
|
||||
struct sockaddr_rc {
|
||||
sa_family_t rc_family;
|
||||
|
|
|
|||
Loading…
Reference in a new issue