Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ec56fc3 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

net: allow fallback function to pass netdev 



For most of these calls we can just pass NULL through to the fallback
function as the sb_dev. The only cases where we cannot are the cases where
we might be dealing with either an upper device or a driver that would
have configured things to support an sb_dev itself.

The only driver that has any significant change in this patch set should be
ixgbe as we can drop the redundant functionality that existed in both the
ndo_select_queue function and the fallback function that was passed through
to us.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4f49dec9

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb, 
	if (skb_rx_queue_recorded(skb))

		qid = skb_get_rx_queue(skb);

	else

		qid = fallback(dev, skb);

		qid = fallback(dev, skb, NULL);



	return qid;

}

drivers/net/ethernet/broadcom/bcmsysport.c

+2 −2
Original line number Diff line number Diff line
@@ -2116,7 +2116,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, 
	unsigned int q, port;



	if (!netdev_uses_dsa(dev))

		return fallback(dev, skb);

		return fallback(dev, skb, NULL);



	/* DSA tagging layer will have configured the correct queue */

	q = BRCM_TAG_GET_QUEUE(queue);
@@ -2124,7 +2124,7 @@ static u16 bcm_sysport_select_queue(struct net_device *dev, struct sk_buff *skb, 
	tx_ring = priv->ring_map[q + port * priv->per_port_num_tx_queues];



	if (unlikely(!tx_ring))

		return fallback(dev, skb);

		return fallback(dev, skb, NULL);



	return tx_ring->index;

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+2 −1
Original line number Diff line number Diff line
@@ -1933,7 +1933,8 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb, 
	}



	/* select a non-FCoE queue */

	return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);

	return fallback(dev, skb, NULL) %

	       (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);

}



void bnx2x_set_num_queues(struct bnx2x *bp)

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, 
		return txq;

	}



	return fallback(dev, skb) % dev->real_num_tx_queues;

	return fallback(dev, skb, NULL) % dev->real_num_tx_queues;

}



static int closest_timer(const struct sge *s, int time)

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ hns_nic_select_queue(struct net_device *ndev, struct sk_buff *skb, 
	    is_multicast_ether_addr(eth_hdr->h_dest))

		return 0;

	else

		return fallback(ndev, skb);

		return fallback(ndev, skb, NULL);

}



static const struct net_device_ops hns_nic_netdev_ops = {