Skip to content

Commit 9ce24c3

Browse files
committed
zebra: remove ZEBRA_IF_BOND_SLAVE interface type
It is never actually used in the code. Closes #13532. Signed-off-by: Igor Ryzhov <[email protected]>
1 parent c4676ad commit 9ce24c3

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

zebra/if_netlink.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ static void netlink_determine_zebra_iftype(const char *kind,
279279
*zif_type = ZEBRA_IF_VETH;
280280
else if (strcmp(kind, "bond") == 0)
281281
*zif_type = ZEBRA_IF_BOND;
282-
else if (strcmp(kind, "bond_slave") == 0)
283-
*zif_type = ZEBRA_IF_BOND_SLAVE;
284282
else if (strcmp(kind, "gre") == 0)
285283
*zif_type = ZEBRA_IF_GRE;
286284
}
@@ -1120,10 +1118,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
11201118
if (linkinfo[IFLA_INFO_SLAVE_KIND])
11211119
slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]);
11221120

1123-
if ((slave_kind != NULL) && strcmp(slave_kind, "bond") == 0)
1124-
netlink_determine_zebra_iftype("bond_slave", &zif_type);
1125-
else
1126-
netlink_determine_zebra_iftype(kind, &zif_type);
1121+
netlink_determine_zebra_iftype(kind, &zif_type);
11271122
}
11281123

11291124
/* If VRF, create the VRF structure itself. */

zebra/interface.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,9 +1697,6 @@ static const char *zebra_ziftype_2str(enum zebra_iftype zif_type)
16971697
case ZEBRA_IF_BOND:
16981698
return "bond";
16991699

1700-
case ZEBRA_IF_BOND_SLAVE:
1701-
return "bond_slave";
1702-
17031700
case ZEBRA_IF_MACVLAN:
17041701
return "macvlan";
17051702

zebra/interface.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ enum zebra_iftype {
3939
ZEBRA_IF_MACVLAN, /* MAC VLAN interface*/
4040
ZEBRA_IF_VETH, /* VETH interface*/
4141
ZEBRA_IF_BOND, /* Bond */
42-
ZEBRA_IF_BOND_SLAVE, /* Bond */
4342
ZEBRA_IF_GRE, /* GRE interface */
4443
};
4544

0 commit comments

Comments
 (0)