* [PATCH] net: ethernet: ti: netcp_core: return netdev_tx_t in xmit
@ 2017-02-09 14:24 Ivan Khoronzhuk
2017-02-10 19:45 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Ivan Khoronzhuk @ 2017-02-09 14:24 UTC (permalink / raw)
To: w-kwok2, m-karicheri2, netdev; +Cc: linux-kernel, Ivan Khoronzhuk
The _xmit function should return netdev_tx_t type.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
---
Based on net-next/master
drivers/net/ethernet/ti/netcp_core.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 7c7ae08..5845ad8 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1280,7 +1280,8 @@ static int netcp_tx_submit_skb(struct netcp_intf *netcp,
}
/* Submit the packet */
-static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+static netdev_tx_t netcp_ndo_start_xmit(struct sk_buff *skb,
+ struct net_device *ndev)
{
struct netcp_intf *netcp = netdev_priv(ndev);
struct netcp_stats *tx_stats = &netcp->stats;
@@ -1300,7 +1301,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
dev_warn(netcp->ndev_dev, "padding failed (%d), packet dropped\n",
ret);
tx_stats->tx_dropped++;
- return ret;
+ return NETDEV_TX_BUSY;
}
skb->len = NETCP_MIN_PACKET_SIZE;
}
@@ -1329,7 +1330,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
if (desc)
netcp_free_tx_desc_chain(netcp, desc, sizeof(*desc));
dev_kfree_skb(skb);
- return ret;
+ return NETDEV_TX_BUSY;
}
int netcp_txpipe_close(struct netcp_tx_pipe *tx_pipe)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: netcp_core: return netdev_tx_t in xmit
2017-02-09 14:24 [PATCH] net: ethernet: ti: netcp_core: return netdev_tx_t in xmit Ivan Khoronzhuk
@ 2017-02-10 19:45 ` David Miller
2017-02-11 1:08 ` Ivan Khoronzhuk
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2017-02-10 19:45 UTC (permalink / raw)
To: ivan.khoronzhuk; +Cc: w-kwok2, m-karicheri2, netdev, linux-kernel
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Thu, 9 Feb 2017 16:24:14 +0200
> @@ -1300,7 +1301,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> dev_warn(netcp->ndev_dev, "padding failed (%d), packet dropped\n",
> ret);
> tx_stats->tx_dropped++;
> - return ret;
> + return NETDEV_TX_BUSY;
> }
> skb->len = NETCP_MIN_PACKET_SIZE;
> }
> @@ -1329,7 +1330,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> if (desc)
> netcp_free_tx_desc_chain(netcp, desc, sizeof(*desc));
> dev_kfree_skb(skb);
> - return ret;
> + return NETDEV_TX_BUSY;
> }
I really think these should be returning NET_XMIT_DROP.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: netcp_core: return netdev_tx_t in xmit
2017-02-10 19:45 ` David Miller
@ 2017-02-11 1:08 ` Ivan Khoronzhuk
0 siblings, 0 replies; 3+ messages in thread
From: Ivan Khoronzhuk @ 2017-02-11 1:08 UTC (permalink / raw)
To: David Miller; +Cc: w-kwok2, m-karicheri2, netdev, linux-kernel
On Fri, Feb 10, 2017 at 02:45:21PM -0500, David Miller wrote:
> From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
> Date: Thu, 9 Feb 2017 16:24:14 +0200
>
> > @@ -1300,7 +1301,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> > dev_warn(netcp->ndev_dev, "padding failed (%d), packet dropped\n",
> > ret);
> > tx_stats->tx_dropped++;
> > - return ret;
> > + return NETDEV_TX_BUSY;
> > }
> > skb->len = NETCP_MIN_PACKET_SIZE;
> > }
> > @@ -1329,7 +1330,7 @@ static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> > if (desc)
> > netcp_free_tx_desc_chain(netcp, desc, sizeof(*desc));
> > dev_kfree_skb(skb);
> > - return ret;
> > + return NETDEV_TX_BUSY;
> > }
>
> I really think these should be returning NET_XMIT_DROP.
Yes, it seems here can be a little more changes then, will send new version
later.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-11 1:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-09 14:24 [PATCH] net: ethernet: ti: netcp_core: return netdev_tx_t in xmit Ivan Khoronzhuk
2017-02-10 19:45 ` David Miller
2017-02-11 1:08 ` Ivan Khoronzhuk
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).