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

Merge pull request #11201 from donaldsharp/unused_in_netlink_compiles

Browse Source 
Remove some unused functions in zebra
This commit is contained in:
Donatas Abraitis 2022-05-16 09:57:30 +03:00 committed by GitHub
commit 8f5e706a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra/ioctl.c
View File

@ -48,6 +48,7 @@ void ifreq_set_name(struct ifreq *ifreq, struct interface *ifp)
strlcpy(ifreq->ifr_name, ifp->name, sizeof(ifreq->ifr_name)); strlcpy(ifreq->ifr_name, ifp->name, sizeof(ifreq->ifr_name));
} }
#ifndef HAVE_NETLINK
/* call ioctl system call */ /* call ioctl system call */
int if_ioctl(unsigned long request, caddr_t buffer) int if_ioctl(unsigned long request, caddr_t buffer)
{ {
@ -73,6 +74,7 @@ int if_ioctl(unsigned long request, caddr_t buffer)
} }
return 0; return 0;
} }
#endif
/* call ioctl system call */ /* call ioctl system call */
int vrf_if_ioctl(unsigned long request, caddr_t buffer, vrf_id_t vrf_id) int vrf_if_ioctl(unsigned long request, caddr_t buffer, vrf_id_t vrf_id)
@ -127,7 +129,6 @@ static int if_ioctl_ipv6(unsigned long request, caddr_t buffer)
} }
return 0; return 0;
} }
#endif /* ! HAVE_NETLINK */
/* /*
* get interface metric * get interface metric
@ -174,6 +175,7 @@ void if_get_mtu(struct interface *ifp)
ifp->mtu6 = ifp->mtu = -1; ifp->mtu6 = ifp->mtu = -1;
#endif #endif
} }
#endif /* ! HAVE_NETLINK */
/* /*
* Handler for interface address programming via the zebra dplane, * Handler for interface address programming via the zebra dplane,
@ -217,13 +219,6 @@ enum zebra_dplane_result kernel_address_update_ctx(
ZEBRA_DPLANE_REQUEST_SUCCESS : ZEBRA_DPLANE_REQUEST_FAILURE); ZEBRA_DPLANE_REQUEST_SUCCESS : ZEBRA_DPLANE_REQUEST_FAILURE);
} }
#endif /* !HAVE_NETLINK */
#ifdef HAVE_NETLINK
/* TODO -- remove; no use of these apis with netlink any longer */
#else /* ! HAVE_NETLINK */
#ifdef HAVE_STRUCT_IFALIASREQ #ifdef HAVE_STRUCT_IFALIASREQ
/* /*

2
zebra/rib.h
View File

@ -357,8 +357,6 @@ enum rib_update_event {
RIB_UPDATE_MAX RIB_UPDATE_MAX
}; };
extern void route_entry_copy_nexthops(struct route_entry *re,
struct nexthop *nh);
int route_entry_update_nhe(struct route_entry *re, int route_entry_update_nhe(struct route_entry *re,
struct nhg_hash_entry *new_nhghe); struct nhg_hash_entry *new_nhghe);

9
zebra/zebra_rib.c
View File

@ -292,15 +292,6 @@ int zebra_check_addr(const struct prefix *p)
return 1; return 1;
} }
/**
* copy_nexthop - copy a nexthop to the rib structure.
*/
void route_entry_copy_nexthops(struct route_entry *re, struct nexthop *nh)
{
assert(!re->nhe->nhg.nexthop);
copy_nexthops(&re->nhe->nhg.nexthop, nh, NULL);
}
static void route_entry_attach_ref(struct route_entry *re, static void route_entry_attach_ref(struct route_entry *re,
struct nhg_hash_entry *new) struct nhg_hash_entry *new)
{ {