Commit 2a0dccb3 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Move struct sco_pinfo into net/bluetooth/sco.c 



There exists no external user of struct sco_pinfo and sco_pi and
thus move it into the one place that is actually using it.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent a6801ca9

include/net/bluetooth/sco.h

+0 −12
Original line number Diff line number Diff line
@@ -64,16 +64,4 @@ struct sco_conn { 
#define sco_conn_lock(c)	spin_lock(&c->lock);

#define sco_conn_unlock(c)	spin_unlock(&c->lock);



/* ----- SCO socket info ----- */

#define sco_pi(sk) ((struct sco_pinfo *) sk)



struct sco_pinfo {

	struct bt_sock	bt;

	bdaddr_t	src;

	bdaddr_t	dst;

	__u32		flags;

	__u16		setting;

	struct sco_conn	*conn;

};



#endif /* __SCO_H */

net/bluetooth/sco.c

+12 −0
Original line number Diff line number Diff line
@@ -46,6 +46,18 @@ static void sco_chan_del(struct sock *sk, int err); 
static void sco_sock_close(struct sock *sk);

static void sco_sock_kill(struct sock *sk);



/* ----- SCO socket info ----- */

#define sco_pi(sk) ((struct sco_pinfo *) sk)



struct sco_pinfo {

	struct bt_sock	bt;

	bdaddr_t	src;

	bdaddr_t	dst;

	__u32		flags;

	__u16		setting;

	struct sco_conn	*conn;

};



/* ---- SCO timers ---- */

static void sco_sock_timeout(unsigned long arg)

{