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

diff --cc nest/mpls.Y
Simple merge

diff --cc nest/protocol.h
index aee2c08e46d8434fb091eded23f0d27ae04e1315,c87d38148005deaea1ced73545fb291540031335..2172ecf456184a92c8bcfcf4b29804e1e0e8ff03
--- 1/nest/protocol.h
--- 2/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);

diff --cc proto/static/static.c
Simple merge