Skip to content

Commit 08b403d

Browse files
vladimirolteankuba-moo
authored andcommitted
Revert "veth: Add updating of trans_start"
This reverts commit e66e257. The veth driver no longer needs these hacks which are slightly detrimential to the fast path performance, because the bonding driver is keeping track of TX times of ARP and NS probes by itself, which it should. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 4873a1b commit 08b403d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/net/veth.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ static bool veth_skb_is_eligible_for_gro(const struct net_device *dev,
312312
static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
313313
{
314314
struct veth_priv *rcv_priv, *priv = netdev_priv(dev);
315-
struct netdev_queue *queue = NULL;
316315
struct veth_rq *rq = NULL;
317316
struct net_device *rcv;
318317
int length = skb->len;
@@ -330,7 +329,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
330329
rxq = skb_get_queue_mapping(skb);
331330
if (rxq < rcv->real_num_rx_queues) {
332331
rq = &rcv_priv->rq[rxq];
333-
queue = netdev_get_tx_queue(dev, rxq);
334332

335333
/* The napi pointer is available when an XDP program is
336334
* attached or when GRO is enabled
@@ -342,8 +340,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
342340

343341
skb_tx_timestamp(skb);
344342
if (likely(veth_forward_skb(rcv, skb, rq, use_napi) == NET_RX_SUCCESS)) {
345-
if (queue)
346-
txq_trans_cond_update(queue);
347343
if (!use_napi)
348344
dev_lstats_add(dev, length);
349345
} else {

0 commit comments

Comments
 (0)