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

zebra/if_netlink: trivial cleanup of IFLA_WIRELESS

Browse Source 
With:
	commit ba7773964c
	Author: Renato Westphal <renato@opensourcerouting.org>
	Date:   Wed Sep 20 22:12:56 2017 -0300

We added our own copy of if_link.h (among others).  This
file unconditionally defines IFLA_WIRELESS, so we don't need
the conditional defines in the if_netlink.c code...

Issue: https://github.com/FRRouting/frr/issues/2299
Signed-off-by: Arthur Jones <arthur.jones@riverbed.com>
This commit is contained in:
Arthur Jones 2018-05-25 14:34:32 -07:00
parent cfb3b1a37d
commit 0f08a57a07
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/if_netlink.c
View File

@ -597,7 +597,6 @@ static int netlink_interface(struct sockaddr_nl *snl, struct nlmsghdr *h,
memset(linkinfo, 0, sizeof linkinfo); memset(linkinfo, 0, sizeof linkinfo);
netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
#ifdef IFLA_WIRELESS
/* check for wireless messages to ignore */ /* check for wireless messages to ignore */
if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) { if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) {
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
@ -605,7 +604,6 @@ static int netlink_interface(struct sockaddr_nl *snl, struct nlmsghdr *h,
__func__); __func__);
return 0; return 0;
} }
#endif /* IFLA_WIRELESS */
if (tb[IFLA_IFNAME] == NULL) if (tb[IFLA_IFNAME] == NULL)
return -1; return -1;
@ -1122,7 +1120,6 @@ int netlink_link_change(struct sockaddr_nl *snl, struct nlmsghdr *h,
memset(linkinfo, 0, sizeof linkinfo); memset(linkinfo, 0, sizeof linkinfo);
netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); netlink_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
#ifdef IFLA_WIRELESS
/* check for wireless messages to ignore */ /* check for wireless messages to ignore */
if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) { if ((tb[IFLA_WIRELESS] != NULL) && (ifi->ifi_change == 0)) {
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)
@ -1130,7 +1127,6 @@ int netlink_link_change(struct sockaddr_nl *snl, struct nlmsghdr *h,
__func__); __func__);
return 0; return 0;
} }
#endif /* IFLA_WIRELESS */
if (tb[IFLA_IFNAME] == NULL) if (tb[IFLA_IFNAME] == NULL)
return -1; return -1;