summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
index d31fafb22550..ac7c5873a9f7 100644
--- a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x_main.c
@@ -3260,7 +3260,7 @@ static int mv_pp2x_tx(struct sk_buff *skb, struct net_device *dev)
if (mv_pp2x_txq_free_count(txq_pcpu) < port->txq_stop_limit)
netif_tx_stop_queue(nq);
/* Enable transmit */
- if (!skb->xmit_more || netif_xmit_stopped(nq)) {
+ if (!netdev_xmit_more() || netif_xmit_stopped(nq)) {
mv_pp2x_aggr_txq_pend_desc_add(port, aggr_txq->xmit_bulk);
aggr_txq->xmit_bulk = 0;
}
@@ -4197,15 +4197,13 @@ static int mv_pp2x_netdev_set_features(struct net_device *dev,
return 0;
}
-u16 mv_pp2x_select_queue(struct net_device *dev, struct sk_buff *skb,
- struct net_device *sb_dev,
- select_queue_fallback_t fallback)
-
+static u16 mv_pp2x_select_queue(struct net_device *dev, struct sk_buff *skb,
+ struct net_device *sb_dev)
{
if (skb->queue_mapping)
return skb->napi_id - 1;
- return fallback(dev, skb, NULL) % mv_pp2x_txq_number;
+ return netdev_pick_tx(dev, skb, NULL) % mv_pp2x_txq_number;
}
/* Device ops */