From: Maria Matejka <mq@ucw.cz>
Date: Thu, 22 May 2025 15:27:28 +0000 (+0200)
Subject: Merge commit '14cf8454' into thread-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e32aa19081900086e7ff489a46e2c540c9390f2;p=thirdparty%2Fbird.git

Merge commit '14cf8454' into thread-next
---

6e32aa19081900086e7ff489a46e2c540c9390f2
diff --cc nest/proto.c
index 3565f229d,1aeea96c5..1fd3cc7bc
--- a/nest/proto.c
+++ b/nest/proto.c
@@@ -1203,14 -906,17 +1203,17 @@@ channel_reconfigure(struct channel *c, 
    if (import_changed && !channel_reloadable(c))
      return 0;
  
-   if (import_changed || export_changed)
-     log(L_INFO "Reloading channel %s.%s", c->proto->name, c->name);
- 
    if (import_changed)
+   {
+     log(L_INFO "Reloading channel %s.%s for import", c->proto->name, c->name);
 -    channel_request_reload(c);
 +    channel_request_reload(c, NULL);
+   }
  
    if (export_changed)
+   {
+     log(L_INFO "Reloading channel %s.%s for export", c->proto->name, c->name);
 -    channel_request_feeding(c);
 +    channel_refeed(c, NULL);
+   }
  
  done:
    CD(c, "Reconfigured");