kernel: bump 5.15 to 5.15.140

[openwrt/staging/nbd.git] / target / linux / generic / backport-5.15 / 703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch

diff --git a/target/linux/generic/backport-5.15/703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch b/target/linux/generic/backport-5.15/703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch
index d826877e7dc69315fc69af97642438f2f76e38a8..5d5ac4b009488777bb54569af40096dab332b099 100644 (file)
--- a/target/linux/generic/backport-5.15/703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch
+++ b/target/linux/generic/backport-5.15/703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch
@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        pl = kzalloc(sizeof(*pl), GFP_KERNEL);
        if (!pl)
                return ERR_PTR(-ENOMEM);
-@@ -946,9 +987,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
+@@ -947,9 +988,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
   * @pl: a pointer to a &struct phylink returned from phylink_create()
   * @pcs: a pointer to the &struct phylink_pcs
   *
@@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   *
   * Please note that there are behavioural changes with the mac_config()
   * callback if a PCS is present (denoting a newer setup) so removing a PCS
-@@ -959,6 +1001,14 @@ void phylink_set_pcs(struct phylink *pl,
+@@ -960,6 +1002,14 @@ void phylink_set_pcs(struct phylink *pl,
  {
        pl->pcs = pcs;
        pl->pcs_ops = pcs->ops;