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

Commit cd9bb52b authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

staging: et131x: Remove ai_force_[duplex|speed] from et131x_adapter 



The ai_force settings were used to set the ethernet speed and duplex manually.
This is now being done by the phy_device, so remove.

Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b84981c8

drivers/staging/et131x/et1310_phy.c

+2 −4
Original line number Diff line number Diff line
@@ -498,10 +498,8 @@ void et131x_mii_check(struct et131x_adapter *adapter, 
		}

	}



	if ((bmsr_ints & BMSR_ANEGCOMPLETE) ||

	   (adapter->ai_force_duplex == 3 && (bmsr_ints & BMSR_LSTATUS))) {

		if ((bmsr & BMSR_ANEGCOMPLETE) ||

		    adapter->ai_force_duplex == 3) {

	if (bmsr_ints & BMSR_ANEGCOMPLETE) {

		if (bmsr & BMSR_ANEGCOMPLETE) {

			et1310_phy_link_status(adapter,

					     &link_status, &autoneg_status,

					     &speed, &duplex, &mdi_mdix,

drivers/staging/et131x/et131x_adapter.h

+0 −2
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ struct et131x_adapter { 
	u32 registry_jumbo_packet;	/* Max supported ethernet packet size */



	/* Derived from the registry: */

	u8 ai_force_duplex;	/* duplex setting */

	u16 ai_force_speed;	/* 'Speed', user over-ride of line speed */

	u8 flowcontrol;		/* flow control validated by the far-end */



	/* Minimize init-time */