Commit 81dbc241 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jakub Kicinski
Browse files

ionic: change set_rx_mode from_ndo to can_sleep 



Instead of having two different ways of expressing the same
sleepability concept, using opposite logic, we can rework the
from_ndo to can_sleep for a more consistent usage.

Fixes: 1800eee1 ("net: ionic: Replace in_interrupt() usage.")
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e94f76bb

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+10 −10
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ static void ionic_lif_rx_mode(struct ionic_lif *lif, unsigned int rx_mode) 
		lif->rx_mode = rx_mode;

}



static void ionic_set_rx_mode(struct net_device *netdev, bool from_ndo)

static void ionic_set_rx_mode(struct net_device *netdev, bool can_sleep)

{

	struct ionic_lif *lif = netdev_priv(netdev);

	struct ionic_deferred_work *work;
@@ -1149,10 +1149,10 @@ static void ionic_set_rx_mode(struct net_device *netdev, bool from_ndo) 
	 *       we remove our overflow flag and check the netdev flags

	 *       to see if we can disable NIC PROMISC

	 */

	if (from_ndo)

		__dev_uc_sync(netdev, ionic_ndo_addr_add, ionic_ndo_addr_del);

	else

	if (can_sleep)

		__dev_uc_sync(netdev, ionic_addr_add, ionic_addr_del);

	else

		__dev_uc_sync(netdev, ionic_ndo_addr_add, ionic_ndo_addr_del);

	nfilters = le32_to_cpu(lif->identity->eth.max_ucast_filters);

	if (netdev_uc_count(netdev) + 1 > nfilters) {

		rx_mode |= IONIC_RX_MODE_F_PROMISC;
@@ -1164,10 +1164,10 @@ static void ionic_set_rx_mode(struct net_device *netdev, bool from_ndo) 
	}



	/* same for multicast */

	if (from_ndo)

		__dev_mc_sync(netdev, ionic_ndo_addr_add, ionic_ndo_addr_del);

	else

	if (can_sleep)

		__dev_mc_sync(netdev, ionic_addr_add, ionic_addr_del);

	else

		__dev_mc_sync(netdev, ionic_ndo_addr_add, ionic_ndo_addr_del);

	nfilters = le32_to_cpu(lif->identity->eth.max_mcast_filters);

	if (netdev_mc_count(netdev) > nfilters) {

		rx_mode |= IONIC_RX_MODE_F_ALLMULTI;
@@ -1179,7 +1179,7 @@ static void ionic_set_rx_mode(struct net_device *netdev, bool from_ndo) 
	}



	if (lif->rx_mode != rx_mode) {

		if (from_ndo) {

		if (!can_sleep) {

			work = kzalloc(sizeof(*work), GFP_ATOMIC);

			if (!work) {

				netdev_err(lif->netdev, "%s OOM\n", __func__);
@@ -1197,7 +1197,7 @@ static void ionic_set_rx_mode(struct net_device *netdev, bool from_ndo) 


static void ionic_ndo_set_rx_mode(struct net_device *netdev)

{

	ionic_set_rx_mode(netdev, true);

	ionic_set_rx_mode(netdev, false);

}



static __le64 ionic_netdev_features_to_nic(netdev_features_t features)
@@ -1784,7 +1784,7 @@ static int ionic_txrx_init(struct ionic_lif *lif) 
	if (lif->netdev->features & NETIF_F_RXHASH)

		ionic_lif_rss_init(lif);



	ionic_set_rx_mode(lif->netdev, false);

	ionic_set_rx_mode(lif->netdev, true);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE