Skip to content

Commit

Permalink
NFC: Add support for SO_TIMESTAMP LLCP socket option
Browse files Browse the repository at this point in the history
Set timestamp in sent and received sk_buffs. timestamp is then put in
msghdr structure in llcp_sock_recvmsg().

Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Thierry Escande authored and Samuel Ortiz committed Jan 9, 2013
1 parent e7f767a commit 2c2d45b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/nfc/llcp/commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)

skb = llcp_add_header(skb, 0, 0, LLCP_PDU_SYMM);

__net_timestamp(skb);

nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_TX);

return nfc_data_exchange(dev, local->target_idx, skb,
Expand Down
4 changes: 4 additions & 0 deletions net/nfc/llcp/llcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,8 @@ static void nfc_llcp_tx_work(struct work_struct *work)
if (ptype == LLCP_PDU_I)
copy_skb = skb_copy(skb, GFP_ATOMIC);

__net_timestamp(skb);

nfc_llcp_send_to_raw_sock(local, skb,
NFC_LLCP_DIRECTION_TX);

Expand Down Expand Up @@ -1245,6 +1247,8 @@ static void nfc_llcp_rx_work(struct work_struct *work)
print_hex_dump(KERN_DEBUG, "LLCP Rx: ", DUMP_PREFIX_OFFSET,
16, 1, skb->data, skb->len, true);

__net_timestamp(skb);

nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_RX);

switch (ptype) {
Expand Down
2 changes: 2 additions & 0 deletions net/nfc/llcp/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,8 @@ static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
return -EFAULT;
}

sock_recv_timestamp(msg, sk, skb);

if (sk->sk_type == SOCK_DGRAM && msg->msg_name) {
struct nfc_llcp_ui_cb *ui_cb = nfc_llcp_ui_skb_cb(skb);
struct sockaddr_nfc_llcp sockaddr;
Expand Down

0 comments on commit 2c2d45b

Please sign in to comment.