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

Commit cc1122b0 authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

net: phy: Fix spelling mistake: "advertisment"-> "advertisement" 



Trivial fix to spelling mistake in comments and error message text.

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0913667a

drivers/net/phy/bcm7xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int bcm7xxx_28nm_set_tunable(struct phy_device *phydev, 
	if (ret)

		return ret;



	/* Disable EEE advertisment since this prevents the PHY

	/* Disable EEE advertisement since this prevents the PHY

	 * from successfully linking up, trigger auto-negotiation restart

	 * to let the MAC decide what to do.

	 */

drivers/net/phy/marvell.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static int m88e1510_config_init(struct phy_device *phydev) 
			return err;



		/* There appears to be a bug in the 88e1512 when used in

		 * SGMII to copper mode, where the AN advertisment register

		 * SGMII to copper mode, where the AN advertisement register

		 * clears the pause bits each time a negotiation occurs.

		 * This means we can never be truely sure what was advertised,

		 * so disable Pause support.

drivers/net/phy/marvell10g.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int mv3310_read_status(struct phy_device *phydev) 
		if (val < 0)

			return val;



		/* Read the link partner's 1G advertisment */

		/* Read the link partner's 1G advertisement */

		val = phy_read_mmd(phydev, MDIO_MMD_AN, MV_AN_STAT1000);

		if (val < 0)

			return val;

drivers/net/phy/phy-c45.c

+4 −4
Original line number Diff line number Diff line
@@ -163,11 +163,11 @@ int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask) 
EXPORT_SYMBOL_GPL(genphy_c45_read_link);



/**

 * genphy_c45_read_lpa - read the link partner advertisment and pause

 * genphy_c45_read_lpa - read the link partner advertisement and pause

 * @phydev: target phy_device struct

 *

 * Read the Clause 45 defined base (7.19) and 10G (7.33) status registers,

 * filling in the link partner advertisment, pause and asym_pause members

 * filling in the link partner advertisement, pause and asym_pause members

 * in @phydev.  This assumes that the auto-negotiation MMD is present, and

 * the backplane bit (7.48.0) is clear.  Clause 45 PHY drivers are expected

 * to fill in the remainder of the link partner advert from vendor registers.
@@ -176,7 +176,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev) 
{

	int val;



	/* Read the link partner's base page advertisment */

	/* Read the link partner's base page advertisement */

	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA);

	if (val < 0)

		return val;
@@ -185,7 +185,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev) 
	phydev->pause = val & LPA_PAUSE_CAP ? 1 : 0;

	phydev->asym_pause = val & LPA_PAUSE_ASYM ? 1 : 0;



	/* Read the link partner's 10G advertisment */

	/* Read the link partner's 10G advertisement */

	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT);

	if (val < 0)

		return val;

drivers/net/phy/phy-core.c

+2 −2
Original line number Diff line number Diff line
@@ -190,10 +190,10 @@ size_t phy_speeds(unsigned int *speeds, size_t size, 
}



/**

 * phy_resolve_aneg_linkmode - resolve the advertisments into phy settings

 * phy_resolve_aneg_linkmode - resolve the advertisements into phy settings

 * @phydev: The phy_device struct

 *

 * Resolve our and the link partner advertisments into their corresponding

 * Resolve our and the link partner advertisements into their corresponding

 * speed and duplex. If full duplex was negotiated, extract the pause mode

 * from the link partner mask.

 */