diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2024-04-25 13:10:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 13:10:43 +0200 |
| commit | a6040ba1f5adf7135bb75e8797d59b15a1c7f974 (patch) | |
| tree | e177bc62a3b48a21315431d778764ea998bbd963 | |
| parent | 3bb7b497911124c9b69210668f5ca05ec9e8136c (diff) | |
| parent | 3a59d4f9842b936a197b7e27d526e7f38f1f6ddd (diff) | |
Merge pull request #15833 from mjstapp/fix_vtysh_bgp_defs
| -rw-r--r-- | bgpd/bgp_vty.h | 2 | ||||
| -rw-r--r-- | lib/command.h | 2 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h index 4955e4c3df..addd71757d 100644 --- a/bgpd/bgp_vty.h +++ b/bgpd/bgp_vty.h @@ -13,8 +13,6 @@ struct bgp; #define BGP_INSTANCE_HELP_STR "BGP view\nBGP VRF\nView/VRF name\n" #define BGP_INSTANCE_ALL_HELP_STR "BGP view\nBGP VRF\nAll Views/VRFs\n" -#define BGP_AF_STR "Address Family\n" -#define BGP_AF_MODIFIER_STR "Address Family modifier\n" #define BGP_AFI_CMD_STR "<ipv4|ipv6>" #define BGP_AFI_HELP_STR BGP_AF_STR BGP_AF_STR #define BGP_SAFI_CMD_STR "<unicast|multicast|vpn>" diff --git a/lib/command.h b/lib/command.h index ef1815c0bd..e4c575e8d7 100644 --- a/lib/command.h +++ b/lib/command.h @@ -462,6 +462,8 @@ struct cmd_node { #define MPLS_LDP_SYNC_HOLDDOWN_STR \ "Time to wait for LDP-SYNC to occur before restoring if cost\n" #define NO_MPLS_LDP_SYNC_HOLDDOWN_STR "holddown timer disable\n" +#define BGP_AF_STR "Address Family\n" +#define BGP_AF_MODIFIER_STR "Address Family modifier\n" /* Command warnings. */ #define NO_PASSWD_CMD_WARNING \ diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index e03d1464d3..1a358017dc 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -39,7 +39,6 @@ #include "frrstr.h" #include "json.h" #include "ferr.h" -#include "bgpd/bgp_vty.h" DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CMD, "Vtysh cmd copy"); |