net: ethernet: ti: cpsw: move skb timestamp to packet_submit

ikhorn · davem330 · commit 98fdd857a3bd · 2017-06-29T12:28:56.000-04:00
Move sw timestamp function close to channel submit function.

Signed-off-by: Ivan Khoronzhuk &lt;ivan.khoronzhuk@linaro.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
@@ -1236,6 +1236,7 @@ static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv,
 {
 	struct cpsw_common *cpsw = priv->cpsw;
 
+	skb_tx_timestamp(skb);
 	return cpdma_chan_submit(txch, skb, skb->data, skb->len,
 				 priv->emac_port + cpsw->data.dual_emac);
 }
@@ -1611,8 +1612,6 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,
 	    cpts_is_tx_enabled(cpsw->cpts))
 		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
 
-	skb_tx_timestamp(skb);
-
 	q_idx = skb_get_queue_mapping(skb);
 	if (q_idx >= cpsw->tx_ch_num)
 		q_idx = q_idx % cpsw->tx_ch_num;

Original file line number	Diff line number	Diff line change
`@@ -1236,6 +1236,7 @@ static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv,`
`1236`	`1236`	`{`
`1237`	`1237`	`struct cpsw_common *cpsw = priv->cpsw;`
`1238`	`1238`
	`1239`	`+ skb_tx_timestamp(skb);`
`1239`	`1240`	`return cpdma_chan_submit(txch, skb, skb->data, skb->len,`
`1240`	`1241`	`priv->emac_port + cpsw->data.dual_emac);`
`1241`	`1242`	`}`
`@@ -1611,8 +1612,6 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,`
`1611`	`1612`	`cpts_is_tx_enabled(cpsw->cpts))`
`1612`	`1613`	`skb_shinfo(skb)->tx_flags \|= SKBTX_IN_PROGRESS;`
`1613`	`1614`
`1614`		`- skb_tx_timestamp(skb);`
`1615`		`-`
`1616`	`1615`	`q_idx = skb_get_queue_mapping(skb);`
`1617`	`1616`	`if (q_idx >= cpsw->tx_ch_num)`
`1618`	`1617`	`q_idx = q_idx % cpsw->tx_ch_num;`