mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-09 12:48:43 +00:00
Merge commit 'v2.14-30-g41d6002f' into mq-merge-step-2
This commit is contained in:
commit
1709843f15
@ -294,7 +294,7 @@ net_roa6_: net_ip6_ MAX NUM AS NUM
|
||||
|
||||
net_mpls_: MPLS NUM
|
||||
{
|
||||
$$ = cfg_alloc(sizeof(net_addr_roa6));
|
||||
$$ = cfg_alloc(sizeof(net_addr_mpls));
|
||||
net_fill_mpls($$, $2);
|
||||
}
|
||||
|
||||
|
@ -209,7 +209,7 @@ net_type:
|
||||
| MPLS { $$ = NET_MPLS; }
|
||||
;
|
||||
|
||||
CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR)
|
||||
CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR, MPLS)
|
||||
|
||||
|
||||
/* Creation of routing tables */
|
||||
|
Loading…
Reference in New Issue
Block a user