kernel: bump 5.15 to 5.15.76

[openwrt/staging/noltari.git] / target / linux / generic / backport-5.15 / 703-14-v5.17-net-phylink-use-legacy_pre_march2020.patch

diff --git a/target/linux/generic/backport-5.15/703-14-v5.17-net-phylink-use-legacy_pre_march2020.patch b/target/linux/generic/backport-5.15/703-14-v5.17-net-phylink-use-legacy_pre_march2020.patch
index 361fa10d4d59aeae8d4c3927b29fdb58c5887c3a..73e53068b8a1c0dccb51337f2e2a93f002ac91a8 100644 (file)
--- a/target/linux/generic/backport-5.15/703-14-v5.17-net-phylink-use-legacy_pre_march2020.patch
+++ b/target/linux/generic/backport-5.15/703-14-v5.17-net-phylink-use-legacy_pre_march2020.patch
@@ -75,7 +75,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                }
 --- a/include/linux/phylink.h
 +++ b/include/linux/phylink.h
-@@ -208,6 +208,10 @@ struct phylink_pcs *mac_select_pcs(struc
+@@ -210,6 +210,10 @@ struct phylink_pcs *mac_select_pcs(struc
   * negotiation completion state in @state->an_complete, and link up state
   * in @state->link. If possible, @state->lp_advertising should also be
   * populated.
@@ -86,7 +86,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
   */
  void mac_pcs_get_state(struct phylink_config *config,
                       struct phylink_link_state *state);
-@@ -248,6 +252,15 @@ int mac_prepare(struct phylink_config *c
+@@ -250,6 +254,15 @@ int mac_prepare(struct phylink_config *c
   * guaranteed to be correct, and so any mac_config() implementation must
   * never reference these fields.
   *
@@ -102,7 +102,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
   * (this requires a rewrite - please refer to mac_link_up() for situations
   *  where the PCS and MAC are not tightly integrated.)
   *
-@@ -332,6 +345,10 @@ int mac_finish(struct phylink_config *co
+@@ -334,6 +347,10 @@ int mac_finish(struct phylink_config *co
  /**
   * mac_an_restart() - restart 802.3z BaseX autonegotiation
   * @config: a pointer to a &struct phylink_config.