mirror of
https://git.proxmox.com/git/frr
synced 2025-04-28 16:27:54 +00:00
drop patches applied upstream
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
fe1e1fd87c
commit
d6d3df4aec
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,6 +1,5 @@
|
||||
pve/0001-enable-bgp-daemon.patch
|
||||
pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
|
||||
upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch
|
||||
frr/0001-zebra-buffering.patch
|
||||
frr/0002-zebra-buffering.patch
|
||||
frr/0003-zebra-buffering.patch
|
||||
|
@ -1,68 +0,0 @@
|
||||
From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001
|
||||
From: Igor Ryzhov <iryzhov@nfware.com>
|
||||
Date: Thu, 22 Apr 2021 12:48:19 +0300
|
||||
Subject: [PATCH] yang: fix zebra module
|
||||
|
||||
Fixes: #8521
|
||||
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
|
||||
---
|
||||
yang/frr-zebra.yang | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
|
||||
index 2efc45c1464..6b4be659152 100644
|
||||
--- a/yang/frr-zebra.yang
|
||||
+++ b/yang/frr-zebra.yang
|
||||
@@ -2184,8 +2184,8 @@ module frr-zebra {
|
||||
+ "/frr-route-map:match-condition"
|
||||
+ "/frr-route-map:condition-value" {
|
||||
case ipv4-prefix-length {
|
||||
- when "./condition = 'ipv4-prefix-length' or
|
||||
- ./condition = 'ipv4-next-hop-prefix-length'";
|
||||
+ when "./frr-route-map:condition = 'ipv4-prefix-length' or
|
||||
+ ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'";
|
||||
leaf ipv4-prefix-length {
|
||||
type uint8 {
|
||||
range "0..32";
|
||||
@@ -2193,7 +2193,7 @@ module frr-zebra {
|
||||
}
|
||||
}
|
||||
case ipv6-prefix-length {
|
||||
- when "./condition = 'ipv6-prefix-length'";
|
||||
+ when "./frr-route-map:condition = 'ipv6-prefix-length'";
|
||||
leaf ipv6-prefix-length {
|
||||
type uint8 {
|
||||
range "0..128";
|
||||
@@ -2201,13 +2201,13 @@ module frr-zebra {
|
||||
}
|
||||
}
|
||||
case source-protocol {
|
||||
- when "./condition = 'source-protocol'";
|
||||
+ when "./frr-route-map:condition = 'source-protocol'";
|
||||
leaf source-protocol {
|
||||
type frr-route-types:frr-route-types;
|
||||
}
|
||||
}
|
||||
case source-instance {
|
||||
- when "./condition = 'source-instance'";
|
||||
+ when "./frr-route-map:condition = 'source-instance'";
|
||||
leaf source-instance {
|
||||
type uint8 {
|
||||
range "0..255";
|
||||
@@ -2222,14 +2222,14 @@ module frr-zebra {
|
||||
+ "/frr-route-map:set-action"
|
||||
+ "/frr-route-map:action-value" {
|
||||
case source-v4 {
|
||||
- when "./action = 'source'";
|
||||
+ when "./frr-route-map:action = 'source'";
|
||||
leaf source-v4 {
|
||||
description "IPv4 address";
|
||||
type inet:ipv4-address;
|
||||
}
|
||||
}
|
||||
case source-v6 {
|
||||
- when "./action = 'source'";
|
||||
+ when "./frr-route-map:action = 'source'";
|
||||
leaf source-v6 {
|
||||
description "IPv6 address";
|
||||
type inet:ipv6-address;
|
Loading…
Reference in New Issue
Block a user