[PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed

From	Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed
Date	2017-02-11 03:00 +0100
Message-ID	<t9v8J-2Px-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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 <ivan.khoronzhuk@linaro.org>
---
Based on net-next/master

 drivers/net/ethernet/ti/cpsw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 4d1c0c3..503fa8a 100644
--- 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 &&
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> - 2017-02-11 03:00 +0100
  Re: [PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if  skb_padto failed David Miller <davem@davemloft.net> - 2017-02-12 03:30 +0100

csiph-web