proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-25 01:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2300 from ajones-rvbd/ajones-issue-2299

Browse Source 
zebra/if_netlink: trivial cleanup of IFLA_WIRELESS
This commit is contained in:
Donald Sharp 2018-05-25 18:44:40 -04:00 committed by GitHub
commit 22b788b4c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;