From: Maria Matejka <mq@ucw.cz>
Date: Sun, 28 Jan 2024 13:28:17 +0000 (+0100)
Subject: Merge commit 'v2.13.1-183-g2b05844c' into thread-next
X-Git-Tag: v3.0.0~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2ec536d9d3643dbae22c0d67909021e8e1625e;p=thirdparty%2Fbird.git

Merge commit 'v2.13.1-183-g2b05844c' into thread-next
---

8d2ec536d9d3643dbae22c0d67909021e8e1625e
diff --cc nest/protocol.h
index aee2c08e4,c87d38148..2172ecf45
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@@ -678,9 -624,9 +678,9 @@@ struct channel_config *proto_cf_find_ch
  static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc)
  { return proto_cf_find_channel(pc, pc->net_type); }
  static inline struct channel_config *proto_cf_mpls_channel(struct proto_config *pc)
- { return proto_cf_find_channel(pc, NET_MPLS); }
+ { return (pc->net_type != NET_MPLS) ? proto_cf_find_channel(pc, NET_MPLS) : NULL; }
  
 -struct channel *proto_find_channel_by_table(struct proto *p, struct rtable *t);
 +struct channel *proto_find_channel_by_table(struct proto *p, rtable *t);
  struct channel *proto_find_channel_by_name(struct proto *p, const char *n);
  struct channel *proto_add_channel(struct proto *p, struct channel_config *cf);
  void proto_remove_channel(struct proto *p, struct channel *c);