projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream'
[powerpc.git]
/
drivers
/
atm
/
he.c
diff --git
a/drivers/atm/he.c
b/drivers/atm/he.c
index
28250c9
..
fde9334
100644
(file)
--- a/
drivers/atm/he.c
+++ b/
drivers/atm/he.c
@@
-1886,7
+1886,7
@@
he_service_rbrq(struct he_dev *he_dev, int group)
if (rx_skb_reserve > 0)
skb_reserve(skb, rx_skb_reserve);
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
for (iov = he_vcc->iov_head;
iov < he_vcc->iov_tail; ++iov) {