diff options
Diffstat (limited to 'zebra/if_netlink.c')
| -rw-r--r-- | zebra/if_netlink.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 7423e9237f..f153cc3510 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -557,10 +557,11 @@ static int netlink_bridge_interface(struct nlmsghdr *h, int len, ns_id_t ns_id, return 0; } -/* Called from interface_lookup_netlink(). This function is only used - during bootstrap. */ -static int netlink_interface(struct sockaddr_nl *snl, struct nlmsghdr *h, - ns_id_t ns_id, int startup) +/* + * Called from interface_lookup_netlink(). This function is only used + * during bootstrap. + */ +static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup) { int len; struct ifinfomsg *ifi; @@ -597,7 +598,6 @@ static int netlink_interface(struct sockaddr_nl *snl, struct nlmsghdr *h, memset(linkinfo, 0, sizeof linkinfo); netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); -#ifdef IFLA_WIRELESS /* check for wireless messages to ignore */ if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) { if (IS_ZEBRA_DEBUG_KERNEL) @@ -605,7 +605,6 @@ static int netlink_interface(struct sockaddr_nl *snl, struct nlmsghdr *h, __func__); return 0; } -#endif /* IFLA_WIRELESS */ if (tb[IFLA_IFNAME] == NULL) return -1; @@ -874,8 +873,7 @@ int kernel_address_delete_ipv6(struct interface *ifp, struct connected *ifc) return netlink_address(RTM_DELADDR, AF_INET6, ifp, ifc); } -int netlink_interface_addr(struct sockaddr_nl *snl, struct nlmsghdr *h, - ns_id_t ns_id, int startup) +int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup) { int len; struct ifaddrmsg *ifa; @@ -1078,8 +1076,7 @@ static void if_netlink_check_ifp_instance_consistency(uint16_t cmd, */ } -int netlink_link_change(struct sockaddr_nl *snl, struct nlmsghdr *h, - ns_id_t ns_id, int startup) +int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) { int len; struct ifinfomsg *ifi; @@ -1122,7 +1119,6 @@ int netlink_link_change(struct sockaddr_nl *snl, struct nlmsghdr *h, memset(linkinfo, 0, sizeof linkinfo); netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); -#ifdef IFLA_WIRELESS /* check for wireless messages to ignore */ if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) { if (IS_ZEBRA_DEBUG_KERNEL) @@ -1130,7 +1126,6 @@ int netlink_link_change(struct sockaddr_nl *snl, struct nlmsghdr *h, __func__); return 0; } -#endif /* IFLA_WIRELESS */ if (tb[IFLA_IFNAME] == NULL) return -1; |