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

Commit dc86d32a authored by Auke Kok's avatar Auke Kok Committed by Auke Kok
Browse files

e1000: fix mispatch for media type detect. 



Recent patch was mismerged in the miitool path. e1000_media_type_copper
was being compared with the phy type instead of the media type.


Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 8fc65162

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4174,7 +4174,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_media_type_copper) {

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

			switch (data->reg_num) {

			case PHY_CTRL:

				if (mii_reg & MII_CR_POWER_DOWN)