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 (file)
index 04688fa..0000000
--- 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 <ioana.ciornei@nxp.com>
-Date: Thu, 13 Jun 2019 09:37:51 +0300
-Subject: net: phylink: set the autoneg state in phylink_phy_change
-
-From: Ioana Ciornei <ioana.ciornei@nxp.com>
-
-[ 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 <ioana.ciornei@nxp.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 47a7d1619edbfaeb86c080bcff56f681b1ceb43b..f4001e81ba9332db6fdf4bc711023b0161d9ce08 100644 (file)
--- 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