OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[uclinux-h8/linux.git]
/
net
/
can
/
raw.c
diff --git
a/net/can/raw.c
b/net/can/raw.c
index
3aab766
..
c702075
100644
(file)
--- a/
net/can/raw.c
+++ b/
net/can/raw.c
@@
-771,7
+771,7
@@
static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
if (err < 0)
goto free_skb;
- s
ock_tx_timestamp(sk, sk->sk_tsflags, &skb_shinfo(skb)->tx_
flags);
+ s
kb_setup_tx_timestamp(skb, sk->sk_ts
flags);
skb->dev = dev;
skb->sk = sk;