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

Commit 42013e90 authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller
Browse files

liquidio: napi cleanup 



Disable napi when interface is going down.
Delete napi when destroying the interface.

Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6eb79393

drivers/net/ethernet/cavium/liquidio/lio_main.c

+15 −0
Original line number Diff line number Diff line
@@ -1736,6 +1736,10 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx) 
			oct->droq[0]->ops.poll_mode = 0;

	}



	/* Delete NAPI */

	list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list)

		netif_napi_del(napi);



	if (atomic_read(&lio->ifstate) & LIO_IFSTATE_REGISTERED)

		unregister_netdev(netdev);
@@ -2770,6 +2774,17 @@ static int liquidio_stop(struct net_device *netdev) 
{

	struct lio *lio = GET_LIO(netdev);

	struct octeon_device *oct = lio->oct_dev;

	struct napi_struct *napi, *n;



	if (oct->props[lio->ifidx].napi_enabled) {

		list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list)

			napi_disable(napi);



		oct->props[lio->ifidx].napi_enabled = 0;



		if (OCTEON_CN23XX_PF(oct))

			oct->droq[0]->ops.poll_mode = 0;

	}



	ifstate_reset(lio, LIO_IFSTATE_RUNNING);

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+14 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,10 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx) 
		oct->droq[0]->ops.poll_mode = 0;

	}



	/* Delete NAPI */

	list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list)

		netif_napi_del(napi);



	if (atomic_read(&lio->ifstate) & LIO_IFSTATE_REGISTERED)

		unregister_netdev(netdev);
@@ -1784,6 +1788,16 @@ static int liquidio_stop(struct net_device *netdev) 
{

	struct lio *lio = GET_LIO(netdev);

	struct octeon_device *oct = lio->oct_dev;

	struct napi_struct *napi, *n;



	if (oct->props[lio->ifidx].napi_enabled) {

		list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list)

			napi_disable(napi);



		oct->props[lio->ifidx].napi_enabled = 0;



		oct->droq[0]->ops.poll_mode = 0;

	}



	netif_info(lio, ifdown, lio->netdev, "Stopping interface!\n");

	/* Inform that netif carrier is down */