diff --git a/src/sonic-frr/patch/0003-Use-vrf_id-for-vrf-not-tabled_id.patch b/src/sonic-frr/patch/0003-Use-vrf_id-for-vrf-not-tabled_id.patch deleted file mode 100644 index c9a8c0081994..000000000000 --- a/src/sonic-frr/patch/0003-Use-vrf_id-for-vrf-not-tabled_id.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9e7f1de3b79ca6ada8a3124f4cdc35530284832e Mon Sep 17 00:00:00 2001 -From: Pavel Shirshov -Date: Tue, 5 Nov 2019 06:16:51 -0800 -Subject: [PATCH 1/1] Use vrf_id for vrf, not tabled_id - ---- - zebra/zebra_fpm_netlink.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c -index f347d3955..74aab8228 100644 ---- a/zebra/zebra_fpm_netlink.c -+++ b/zebra/zebra_fpm_netlink.c -@@ -284,7 +284,6 @@ static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd, - rib_dest_t *dest, struct route_entry *re) - { - struct nexthop *nexthop; -- struct zebra_vrf *zvrf; - - memset(ri, 0, sizeof(*ri)); - -@@ -292,9 +291,7 @@ static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd, - ri->af = rib_dest_af(dest); - - ri->nlmsg_type = cmd; -- zvrf = rib_dest_vrf(dest); -- if (zvrf) -- ri->rtm_table = zvrf->table_id; -+ ri->rtm_table = zvrf_id(rib_dest_vrf(dest)); - ri->rtm_protocol = RTPROT_UNSPEC; - - /* --- -2.17.1.windows.2 - diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 233021ace50b..45ba556e8d9a 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -1,5 +1,4 @@ 0001-Add-support-of-bgp-tcp-DSCP-value.patch 0002-Reduce-severity-of-Vty-connected-from-message.patch -0003-Use-vrf_id-for-vrf-not-tabled_id.patch 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch 0006-changes-for-making-snmp-socket-non-blocking.patch