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

Commit 219ad6c1 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: remove defensive checks around ndo_open()/ndo_close() 



Device open and close handlers check if the device is already
in the desired state.  Thanks to our reconfig infrastructure
this should not be necessary, there doesn't seem to be any
code in the driver which depends on it.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28b0cfee

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+0 −10
Original line number Diff line number Diff line
@@ -2233,11 +2233,6 @@ static int nfp_net_netdev_open(struct net_device *netdev) 
	struct nfp_net *nn = netdev_priv(netdev);

	int err, r;



	if (nn->dp.ctrl & NFP_NET_CFG_CTRL_ENABLE) {

		nn_err(nn, "Dev is already enabled: 0x%08x\n", nn->dp.ctrl);

		return -EBUSY;

	}



	/* Step 1: Allocate resources for rings and the like

	 * - Request interrupts

	 * - Allocate RX and TX ring resources
@@ -2368,11 +2363,6 @@ static int nfp_net_netdev_close(struct net_device *netdev) 
{

	struct nfp_net *nn = netdev_priv(netdev);



	if (!(nn->dp.ctrl & NFP_NET_CFG_CTRL_ENABLE)) {

		nn_err(nn, "Dev is not up: 0x%08x\n", nn->dp.ctrl);

		return 0;

	}



	/* Step 1: Disable RX and TX rings from the Linux kernel perspective

	 */

	nfp_net_close_stack(nn);