From 09bb27ebe04f61386640690bb263c6b588fc14cd Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 28 Jun 2014 23:55:41 +0100 Subject: [PATCH] staging: vt6656: vnt_tx_packet remove first assignment of time_stamp. This is assigned later in function and should have been removed in an out-of-tree merge. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 55131216f896..e896dfe5d3fc 100644 --- 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; -- 2.39.5