net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed

ikhorn · davem330 · commit 1bf960502e4c · 2017-02-11T21:26:57.000-05:00
If skb_padto failed the skb has been dropped already, so it was
consumed, but it doesn't mean it was sent, thus no need to update
queue tx time, etc. So, return NET_XMIT_DROP as more appropriate.

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
@@ -1604,7 +1604,7 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,
 	if (skb_padto(skb, CPSW_MIN_PACKET_SIZE)) {
 		cpsw_err(priv, tx_err, "packet pad failed\n");
 		ndev->stats.tx_dropped++;
-		return NETDEV_TX_OK;
+		return NET_XMIT_DROP;
 	}
 
 	if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&

Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,7 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,`
`1604`	`1604`	`if (skb_padto(skb, CPSW_MIN_PACKET_SIZE)) {`
`1605`	`1605`	`cpsw_err(priv, tx_err, "packet pad failed\n");`
`1606`	`1606`	`ndev->stats.tx_dropped++;`
`1607`		`- return NETDEV_TX_OK;`
	`1607`	`+ return NET_XMIT_DROP;`
`1608`	`1608`	`}`
`1609`	`1609`
`1610`	`1610`	`if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&`