proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13545 from idryzhov/remove-bond-slave

Browse Source 
zebra: remove ZEBRA_IF_BOND_SLAVE interface type
This commit is contained in:
Donatas Abraitis 2023-06-23 11:01:19 +03:00 committed by GitHub
commit 3cbc7150bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/if_netlink.c
View File

@ -279,8 +279,6 @@ static void netlink_determine_zebra_iftype(const char *kind,
*zif_type = ZEBRA_IF_VETH; *zif_type = ZEBRA_IF_VETH;
else if (strcmp(kind, "bond") == 0) else if (strcmp(kind, "bond") == 0)
*zif_type = ZEBRA_IF_BOND; *zif_type = ZEBRA_IF_BOND;
else if (strcmp(kind, "bond_slave") == 0)
*zif_type = ZEBRA_IF_BOND_SLAVE;
else if (strcmp(kind, "gre") == 0) else if (strcmp(kind, "gre") == 0)
*zif_type = ZEBRA_IF_GRE; *zif_type = ZEBRA_IF_GRE;
} }
@ -1120,10 +1118,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
if (linkinfo[IFLA_INFO_SLAVE_KIND]) if (linkinfo[IFLA_INFO_SLAVE_KIND])
slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]); slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]);
if ((slave_kind != NULL) && strcmp(slave_kind, "bond") == 0) netlink_determine_zebra_iftype(kind, &zif_type);
netlink_determine_zebra_iftype("bond_slave", &zif_type);
else
netlink_determine_zebra_iftype(kind, &zif_type);
} }
/* If VRF, create the VRF structure itself. */ /* If VRF, create the VRF structure itself. */

3
zebra/interface.c
View File

@ -1701,9 +1701,6 @@ static const char *zebra_ziftype_2str(enum zebra_iftype zif_type)
case ZEBRA_IF_BOND: case ZEBRA_IF_BOND:
return "bond"; return "bond";
case ZEBRA_IF_BOND_SLAVE:
return "bond_slave";
case ZEBRA_IF_MACVLAN: case ZEBRA_IF_MACVLAN:
return "macvlan"; return "macvlan";

1
zebra/interface.h
View File

@ -39,7 +39,6 @@ enum zebra_iftype {
ZEBRA_IF_MACVLAN, /* MAC VLAN interface*/ ZEBRA_IF_MACVLAN, /* MAC VLAN interface*/
ZEBRA_IF_VETH, /* VETH interface*/ ZEBRA_IF_VETH, /* VETH interface*/
ZEBRA_IF_BOND, /* Bond */ ZEBRA_IF_BOND, /* Bond */
ZEBRA_IF_BOND_SLAVE, /* Bond */
ZEBRA_IF_GRE, /* GRE interface */ ZEBRA_IF_GRE, /* GRE interface */
}; };