sfc: Remove overly paranoid locking assertions from netdev operations (7bde852a) · Commits · 戴 / test

drivers/net/ethernet/sfc/efx.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1767,8 +1767,6 @@ static int efx_ioctl(struct net_device net_dev, struct ifreq ifr, int cmd)
	struct efx_nic *efx = netdev_priv(net_dev);		struct efx_nic *efx = netdev_priv(net_dev);
	struct mii_ioctl_data *data = if_mii(ifr);		struct mii_ioctl_data *data = if_mii(ifr);

	EFX_ASSERT_RESET_SERIALISED(efx);

	/* Convert phy_id from older PRTAD/DEVAD format */		/* Convert phy_id from older PRTAD/DEVAD format */
	if ((cmd == SIOCGMIIREG \|\| cmd == SIOCSMIIREG) &&		if ((cmd == SIOCGMIIREG \|\| cmd == SIOCSMIIREG) &&
	(data->phy_id & 0xfc00) == 0x0400)		(data->phy_id & 0xfc00) == 0x0400)
	@@ -1850,8 +1848,6 @@ static int efx_net_open(struct net_device *net_dev)
	struct efx_nic *efx = netdev_priv(net_dev);		struct efx_nic *efx = netdev_priv(net_dev);
	int rc;		int rc;

	EFX_ASSERT_RESET_SERIALISED(efx);

	netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n",		netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n",
	raw_smp_processor_id());		raw_smp_processor_id());

	@@ -1946,8 +1942,6 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
	struct efx_nic *efx = netdev_priv(net_dev);		struct efx_nic *efx = netdev_priv(net_dev);
	int rc;		int rc;

	EFX_ASSERT_RESET_SERIALISED(efx);

	rc = efx_check_disabled(efx);		rc = efx_check_disabled(efx);
	if (rc)		if (rc)
	return rc;		return rc;
	@@ -1975,8 +1969,6 @@ static int efx_set_mac_address(struct net_device net_dev, void data)
	struct sockaddr *addr = data;		struct sockaddr *addr = data;
	char *new_addr = addr->sa_data;		char *new_addr = addr->sa_data;

	EFX_ASSERT_RESET_SERIALISED(efx);

	if (!is_valid_ether_addr(new_addr)) {		if (!is_valid_ether_addr(new_addr)) {
	netif_err(efx, drv, efx->net_dev,		netif_err(efx, drv, efx->net_dev,
	"invalid ethernet MAC address requested: %pM\n",		"invalid ethernet MAC address requested: %pM\n",

drivers/net/ethernet/sfc/ethtool.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -529,8 +529,6 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
	if (!efx_tests)		if (!efx_tests)
	goto fail;		goto fail;


	ASSERT_RTNL();
	if (efx->state != STATE_READY) {		if (efx->state != STATE_READY) {
	rc = -EIO;		rc = -EIO;
	goto fail1;		goto fail1;

Admin message