generic: 6.6: manually refresh pending patches

[openwrt/staging/wigyori.git] / target / linux / generic / pending-6.6 / 670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

diff --git a/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 72e8de2f1d1c3062366361efe0d6739253ed42ce..3ab023fdeb4096e02b4891e8548278a949dbb308 100644 (file)
--- a/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -125,7 +125,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
 +static const struct rt6_info ip6_policy_failed_entry_template = {
 +      .dst = {
-+              .__refcnt       = ATOMIC_INIT(1),
++              .__rcuref       = RCUREF_INIT(1),
 +              .__use          = 1,
 +              .obsolete       = DST_OBSOLETE_FORCE_CHK,
 +              .error          = -EACCES,
@@ -137,7 +137,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +
  static const struct rt6_info ip6_blk_hole_entry_template = {
        .dst = {
-               .__refcnt       = ATOMIC_INIT(1),
+               .__rcuref       = RCUREF_INIT(1),
 @@ -1039,6 +1053,7 @@ static const int fib6_prop[RTN_MAX + 1]
        [RTN_BLACKHOLE] = -EINVAL,
        [RTN_UNREACHABLE] = -EHOSTUNREACH,
@@ -213,7 +213,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                                               GFP_KERNEL);
 @@ -6499,11 +6535,21 @@ static int __net_init ip6_route_net_init
                         ip6_template_metrics, true);
-       INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
+       INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached);
  
 +      net->ipv6.ip6_policy_failed_entry =
 +                              kmemdup(&ip6_policy_failed_entry_template,
@@ -223,7 +223,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +      net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
 +      dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
 +                       ip6_template_metrics, true);
-+      INIT_LIST_HEAD(&net->ipv6.ip6_policy_failed_entry->rt6i_uncached);
++      INIT_LIST_HEAD(&net->ipv6.ip6_policy_failed_entry->dst.rt_uncached);
 +
        net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,
                                               sizeof(*net->ipv6.ip6_blk_hole_entry),