Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...

[pandora-kernel.git] / net / bluetooth / cmtp / cmtp.h

diff --git a/net/bluetooth/cmtp/cmtp.h b/net/bluetooth/cmtp/cmtp.h
index c6f78f8..c32638d 100644 (file)
--- a/net/bluetooth/cmtp/cmtp.h
+++ b/net/bluetooth/cmtp/cmtp.h
@@ -82,6 +82,7 @@ struct cmtp_session {
        char name[BTNAMSIZ];
 
        atomic_t terminate;
+       struct task_struct *task;
 
        wait_queue_head_t wait;
 
@@ -121,13 +122,6 @@ void cmtp_detach_device(struct cmtp_session *session);
 
 void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb);
 
-static inline void cmtp_schedule(struct cmtp_session *session)
-{
-       struct sock *sk = session->sock->sk;
-
-       wake_up_interruptible(sk_sleep(sk));
-}
-
 /* CMTP init defines */
 int cmtp_init_sockets(void);
 void cmtp_cleanup_sockets(void);