Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6 (b962697b) · Commits · e / devices / android_kernel_xiaomi_markw

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) {