mirror of
https://github.com/torvalds/linux.git
synced 2026-01-12 00:42:35 +08:00
Bluetooth: SCO: add TX timestamping
Support TX timestamping in SCO sockets. Not available for hdevs without SCO_FLOWCTL. Support MSG_ERRQUEUE in SCO recvmsg. Signed-off-by: Pauli Virtanen <pav@iki.fi> Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
committed by
Luiz Augusto von Dentz
parent
11770f41b8
commit
bdbcd52871
@@ -378,7 +378,8 @@ unlock:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int sco_send_frame(struct sock *sk, struct sk_buff *skb)
|
||||
static int sco_send_frame(struct sock *sk, struct sk_buff *skb,
|
||||
const struct sockcm_cookie *sockc)
|
||||
{
|
||||
struct sco_conn *conn = sco_pi(sk)->conn;
|
||||
int len = skb->len;
|
||||
@@ -389,6 +390,7 @@ static int sco_send_frame(struct sock *sk, struct sk_buff *skb)
|
||||
|
||||
BT_DBG("sk %p len %d", sk, len);
|
||||
|
||||
hci_setup_tx_timestamp(skb, 1, sockc);
|
||||
hci_send_sco(conn->hcon, skb);
|
||||
|
||||
return len;
|
||||
@@ -784,6 +786,7 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct sk_buff *skb;
|
||||
struct sockcm_cookie sockc;
|
||||
int err;
|
||||
|
||||
BT_DBG("sock %p, sk %p", sock, sk);
|
||||
@@ -795,6 +798,14 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
|
||||
if (msg->msg_flags & MSG_OOB)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
hci_sockcm_init(&sockc, sk);
|
||||
|
||||
if (msg->msg_controllen) {
|
||||
err = sock_cmsg_send(sk, msg, &sockc);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0);
|
||||
if (IS_ERR(skb))
|
||||
return PTR_ERR(skb);
|
||||
@@ -802,7 +813,7 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
|
||||
lock_sock(sk);
|
||||
|
||||
if (sk->sk_state == BT_CONNECTED)
|
||||
err = sco_send_frame(sk, skb);
|
||||
err = sco_send_frame(sk, skb, &sockc);
|
||||
else
|
||||
err = -ENOTCONN;
|
||||
|
||||
@@ -868,6 +879,10 @@ static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,
|
||||
struct sock *sk = sock->sk;
|
||||
struct sco_pinfo *pi = sco_pi(sk);
|
||||
|
||||
if (unlikely(flags & MSG_ERRQUEUE))
|
||||
return sock_recv_errqueue(sk, msg, len, SOL_BLUETOOTH,
|
||||
BT_SCM_ERROR);
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
if (sk->sk_state == BT_CONNECT2 &&
|
||||
|
||||
Reference in New Issue
Block a user