OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5deb1cf
)
staging: vt6656: vnt_tx_packet remove first assignment of time_stamp.
author
Malcolm Priestley
<tvboxspy@gmail.com>
Sat, 28 Jun 2014 22:55:41 +0000
(23:55 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 29 Jun 2014 21:25:53 +0000
(14:25 -0700)
This is assigned later in function and should have been removed in
an out-of-tree merge.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c
patch
|
blob
|
history
diff --git
a/drivers/staging/vt6656/rxtx.c
b/drivers/staging/vt6656/rxtx.c
index
5513121
..
e896dfe
100644
(file)
--- a/
drivers/staging/vt6656/rxtx.c
+++ b/
drivers/staging/vt6656/rxtx.c
@@
-929,9
+929,6
@@
int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
frame_size = tx_body_size + 4;
- /* Set time stamp */
- tx_buffer_head->time_stamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
-
/*Set fifo controls */
if (pkt_type == PK_TYPE_11A)
tx_buffer_head->wFIFOCtl = 0;