|
@@ -364,7 +364,7 @@ static void phylink_get_fixed_state(struct phylink *pl, struct phylink_link_stat
|
|
|
}
|
|
|
|
|
|
/* Flow control is resolved according to our and the link partners
|
|
|
- * advertisments using the following drawn from the 802.3 specs:
|
|
|
+ * advertisements using the following drawn from the 802.3 specs:
|
|
|
* Local device Link partner
|
|
|
* Pause AsymDir Pause AsymDir Result
|
|
|
* 1 X 1 X TX+RX
|
|
@@ -683,7 +683,7 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)
|
|
|
linkmode_copy(pl->supported, supported);
|
|
|
linkmode_copy(pl->link_config.advertising, config.advertising);
|
|
|
|
|
|
- /* Restrict the phy advertisment according to the MAC support. */
|
|
|
+ /* Restrict the phy advertisement according to the MAC support. */
|
|
|
ethtool_convert_link_mode_to_legacy_u32(&advertising, config.advertising);
|
|
|
phy->advertising = advertising;
|
|
|
mutex_unlock(&pl->state_mutex);
|
|
@@ -887,7 +887,7 @@ void phylink_start(struct phylink *pl)
|
|
|
|
|
|
/* Apply the link configuration to the MAC when starting. This allows
|
|
|
* a fixed-link to start with the correct parameters, and also
|
|
|
- * ensures that we set the appropriate advertisment for Serdes links.
|
|
|
+ * ensures that we set the appropriate advertisement for Serdes links.
|
|
|
*/
|
|
|
phylink_resolve_flow(pl, &pl->link_config);
|
|
|
phylink_mac_config(pl, &pl->link_config);
|
|
@@ -1074,7 +1074,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
|
|
|
|
|
|
config = pl->link_config;
|
|
|
|
|
|
- /* Mask out unsupported advertisments */
|
|
|
+ /* Mask out unsupported advertisements */
|
|
|
linkmode_and(config.advertising, kset->link_modes.advertising,
|
|
|
pl->supported);
|
|
|
|
|
@@ -1119,7 +1119,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
|
|
|
if (phylink_validate(pl, pl->supported, &config))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- /* If autonegotiation is enabled, we must have an advertisment */
|
|
|
+ /* If autonegotiation is enabled, we must have an advertisement */
|
|
|
if (config.an_enabled && phylink_is_empty_linkmode(config.advertising))
|
|
|
return -EINVAL;
|
|
|
|
|
@@ -1606,7 +1606,7 @@ static int phylink_sfp_module_insert(void *upstream,
|
|
|
iface = sfp_select_interface(pl->sfp_bus, id, config.advertising);
|
|
|
if (iface == PHY_INTERFACE_MODE_NA) {
|
|
|
netdev_err(pl->netdev,
|
|
|
- "selection of interface failed, advertisment %*pb\n",
|
|
|
+ "selection of interface failed, advertisement %*pb\n",
|
|
|
__ETHTOOL_LINK_MODE_MASK_NBITS, config.advertising);
|
|
|
return -EINVAL;
|
|
|
}
|