aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2012-02-22 07:49:28 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-23 06:06:59 -0500
commit97e0bdeb93cc9bd014c21d5400af4fa7f2fe2f91 (patch)
treef552e325571d2e73d09097fe5d79be4c38d8c72f /net/bluetooth
parent54d04dbbb933e8a49429d602b847e367782267e9 (diff)
Bluetooth: Enable timestamps for control channel
The control channel can be also monitored, so include timestamps here as well. And make sure management events get their timestamp when they are created. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_sock.c1
-rw-r--r--net/bluetooth/mgmt.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index dd5635064145..8a814bca00d7 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -782,6 +782,7 @@ static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
782 case HCI_CHANNEL_RAW: 782 case HCI_CHANNEL_RAW:
783 hci_sock_cmsg(sk, msg, skb); 783 hci_sock_cmsg(sk, msg, skb);
784 break; 784 break;
785 case HCI_CHANNEL_CONTROL:
785 case HCI_CHANNEL_MONITOR: 786 case HCI_CHANNEL_MONITOR:
786 sock_recv_timestamp(msg, sk, skb); 787 sock_recv_timestamp(msg, sk, skb);
787 break; 788 break;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 08c657df7f8c..8b4df0473ec3 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -817,6 +817,9 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data,
817 if (data) 817 if (data)
818 memcpy(skb_put(skb, data_len), data, data_len); 818 memcpy(skb_put(skb, data_len), data, data_len);
819 819
820 /* Time stamp */
821 __net_timestamp(skb);
822
820 hci_send_to_control(skb, skip_sk); 823 hci_send_to_control(skb, skip_sk);
821 kfree_skb(skb); 824 kfree_skb(skb);
822 825