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

Commit f0163ac4 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

[E1000]: Fix schedule while atomic when called from mii-tool. 



mii-tool can cause the driver to call msleep during nway reset,
bugzilla.kernel.org bug 8430.  Fix by simply calling reinit_locked
outside of the spinlock, which is safe from ethtool, so it should be
safe from here.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2ac455a

drivers/net/e1000/e1000_main.c

+3 −10
Original line number Diff line number Diff line
@@ -4804,6 +4804,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
			spin_unlock_irqrestore(&adapter->stats_lock, flags);

			return -EIO;

		}

		spin_unlock_irqrestore(&adapter->stats_lock, flags);

		if (adapter->hw.media_type == e1000_media_type_copper) {

			switch (data->reg_num) {

			case PHY_CTRL:
@@ -4824,13 +4825,9 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
						   DUPLEX_HALF;

					retval = e1000_set_spd_dplx(adapter,

								    spddplx);

					if (retval) {

						spin_unlock_irqrestore(

							&adapter->stats_lock,

							flags);

					if (retval)

						return retval;

				}

				}

				if (netif_running(adapter->netdev))

					e1000_reinit_locked(adapter);

				else
@@ -4838,11 +4835,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
				break;

			case M88E1000_PHY_SPEC_CTRL:

			case M88E1000_EXT_PHY_SPEC_CTRL:

				if (e1000_phy_reset(&adapter->hw)) {

					spin_unlock_irqrestore(

						&adapter->stats_lock, flags);

				if (e1000_phy_reset(&adapter->hw))

					return -EIO;

				}

				break;

			}

		} else {
@@ -4857,7 +4851,6 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
				break;

			}

		}

		spin_unlock_irqrestore(&adapter->stats_lock, flags);

		break;

	default:

		return -EOPNOTSUPP;