zebra/if_netlink: trivial cleanup of IFLA_WIRELESS

With:
	commit ba7773964c87019308e65a15b509e9889f7edc49
	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>

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 7423e9237fe0cb56a24aea18d6ef07d7fa869fab..6c32407f7b30dccfa41221a7a93add97d0fe43fb 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -597,7 +597,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 +604,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;
@@ -1122,7 +1120,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 +1127,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;