* [PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed
@ 2017-02-11 1:49 Ivan Khoronzhuk
2017-02-12 2:27 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ivan Khoronzhuk @ 2017-02-11 1:49 UTC (permalink / raw)
To: mugunthanvnm
Cc: grygorii.strashko, netdev, linux-omap, linux-kernel,
Ivan Khoronzhuk
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed
2017-02-11 1:49 [PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed Ivan Khoronzhuk
@ 2017-02-12 2:27 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-02-12 2:27 UTC (permalink / raw)
To: ivan.khoronzhuk
Cc: mugunthanvnm, grygorii.strashko, netdev, linux-omap, linux-kernel
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Sat, 11 Feb 2017 03:49:57 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-12 2:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-11 1:49 [PATCH] net: ethernet: ti: cpsw: return NET_XMIT_DROP if skb_padto failed Ivan Khoronzhuk
2017-02-12 2:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).