projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
net
/
sctp
/
input.c
diff --git
a/net/sctp/input.c
b/net/sctp/input.c
index
742be91
..
28f3224
100644
(file)
--- a/
net/sctp/input.c
+++ b/
net/sctp/input.c
@@
-236,8
+236,8
@@
int sctp_rcv(struct sk_buff *skb)
}
/* SCTP seems to always need a timestamp right now (FIXME) */
- if (skb->
stamp.tv
_sec == 0) {
-
do_gettimeofday(&skb->stamp
);
+ if (skb->
tstamp.off
_sec == 0) {
+
__net_timestamp(skb
);
sock_enable_timestamp(sk);
}