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

Commit cb764326 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by root
Browse files

e1000: Fix mii-tool access to setting speed and duplex 



Paul Rolland reported that e1000 was having a hard time using mii-tool to set speed and duplex.  This patch fixes the issue on both newer hardware as well as fixing the code issue that originally caused the problem.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 74f5ec29

drivers/net/e1000/e1000_main.c

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

			return -EIO;

		}

		if (adapter->hw.phy_type == e1000_phy_m88) {

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

			switch (data->reg_num) {

			case PHY_CTRL:

				if (mii_reg & MII_CR_POWER_DOWN)
@@ -4187,8 +4187,8 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
					else

						spddplx = SPEED_10;

					spddplx += (mii_reg & 0x100)

						   ? FULL_DUPLEX :

						   HALF_DUPLEX;

						   ? DUPLEX_FULL :

						   DUPLEX_HALF;

					retval = e1000_set_spd_dplx(adapter,

								    spddplx);

					if (retval) {