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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
net
/
sctp
/
endpointola.c
diff --git
a/net/sctp/endpointola.c
b/net/sctp/endpointola.c
index
3d9f429
..
9da76ba
100644
(file)
--- a/
net/sctp/endpointola.c
+++ b/
net/sctp/endpointola.c
@@
-481,7
+481,7
@@
normal:
}
if (chunk->transport)
- chunk->transport->last_time_heard =
jiffies
;
+ chunk->transport->last_time_heard =
ktime_get()
;
error = sctp_do_sm(net, SCTP_EVENT_T_CHUNK, subtype, state,
ep, asoc, chunk, GFP_ATOMIC);