From: Greg Kroah-Hartman Date: Fri, 8 Mar 2019 10:09:31 +0000 (+0100) Subject: fix up net phy patch X-Git-Tag: v5.0.1~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d86df3dc7e9a17de177aeb5c49910a3d17eab51f;p=thirdparty%2Fkernel%2Fstable-queue.git fix up net phy patch --- diff --git a/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch index 3a9a209e401..42252301d75 100644 --- a/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch +++ b/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch @@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, -@@ -799,7 +810,7 @@ static struct phy_driver ksphy_driver[] +@@ -938,7 +949,7 @@ static struct phy_driver ksphy_driver[] + .phy_id_mask = MICREL_PHY_ID_MASK, .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, - .driver_data = &ks8737_type, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .config_aneg = genphy_config_aneg, diff --git a/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch index f4b41c814dd..e8a569891f9 100644 --- a/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch +++ b/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch @@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, -@@ -810,7 +821,7 @@ static struct phy_driver ksphy_driver[] +@@ -934,7 +945,7 @@ static struct phy_driver ksphy_driver[] + .phy_id_mask = MICREL_PHY_ID_MASK, .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, - .driver_data = &ks8737_type, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .ack_interrupt = kszphy_ack_interrupt, diff --git a/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch index 2c48a769287..92697cc08f8 100644 --- a/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch +++ b/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch @@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, -@@ -920,7 +931,7 @@ static struct phy_driver ksphy_driver[] +@@ -1044,7 +1055,7 @@ static struct phy_driver ksphy_driver[] + .phy_id_mask = MICREL_PHY_ID_MASK, .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT, - .driver_data = &ks8737_type, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .ack_interrupt = kszphy_ack_interrupt, diff --git a/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch index 39e89acee64..3a4bc91e2aa 100644 --- a/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch +++ b/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch @@ -98,10 +98,10 @@ Signed-off-by: Greg Kroah-Hartman static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, -@@ -640,7 +652,7 @@ static struct phy_driver ksphy_driver[] +@@ -771,7 +783,7 @@ static struct phy_driver ksphy_driver[] + .phy_id_mask = 0x00fffff0, .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .driver_data = &ks8737_type, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .config_aneg = genphy_config_aneg, diff --git a/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch index 804530fdb21..5589a481011 100644 --- a/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch +++ b/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch @@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, -@@ -796,7 +807,7 @@ static struct phy_driver ksphy_driver[] +@@ -940,7 +951,7 @@ static struct phy_driver ksphy_driver[] + .phy_id_mask = MICREL_PHY_ID_MASK, .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .driver_data = &ks8737_type, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .config_aneg = genphy_config_aneg,