From: Greg Kroah-Hartman Date: Thu, 20 Jun 2019 16:49:03 +0000 (+0200) Subject: drop net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch from 5.1 X-Git-Tag: v5.1.13~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=139b67735359731add0046e3074a33983bd89879;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch from 5.1 --- diff --git a/queue-5.1/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch b/queue-5.1/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch deleted file mode 100644 index 04688fac451..00000000000 --- a/queue-5.1/net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch +++ /dev/null @@ -1,32 +0,0 @@ -From foo@baz Wed 19 Jun 2019 02:33:45 PM CEST -From: Ioana Ciornei -Date: Thu, 13 Jun 2019 09:37:51 +0300 -Subject: net: phylink: set the autoneg state in phylink_phy_change - -From: Ioana Ciornei - -[ Upstream commit ef7bfa84725d891bbdb88707ed55b2cbf94942bb ] - -The phy_state field of phylink should carry only valid information -especially when this can be passed to the .mac_config callback. -Update the an_enabled field with the autoneg state in the -phylink_phy_change function. - -Fixes: 9525ae83959b ("phylink: add phylink infrastructure") -Signed-off-by: Ioana Ciornei -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/phylink.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/phylink.c -+++ b/drivers/net/phy/phylink.c -@@ -638,6 +638,7 @@ static void phylink_phy_change(struct ph - pl->phy_state.pause |= MLO_PAUSE_ASYM; - pl->phy_state.interface = phydev->interface; - pl->phy_state.link = up; -+ pl->phy_state.an_enabled = phydev->autoneg; - mutex_unlock(&pl->state_mutex); - - phylink_run_resolve(pl); diff --git a/queue-5.1/series b/queue-5.1/series index 47a7d1619ed..f4001e81ba9 100644 --- a/queue-5.1/series +++ b/queue-5.1/series @@ -7,7 +7,6 @@ lapb-fixed-leak-of-control-blocks.patch neigh-fix-use-after-free-read-in-pneigh_get_next.patch net-dsa-rtl8366-fix-up-vlan-filtering.patch net-openvswitch-do-not-free-vport-if-register_netdevice-is-failed.patch -net-phylink-set-the-autoneg-state-in-phylink_phy_change.patch net-tls-correctly-account-for-copied-bytes-with-multiple-sk_msgs.patch nfc-ensure-presence-of-required-attributes-in-the-deactivate_target-handler.patch sctp-free-cookie-before-we-memdup-a-new-one.patch