2005-02-14 Paul Jakma <paul@dishone.st>

	* Not all Linux netlink systems have IFLA_WIRELESS

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 1f97fef9ac7d42968a595918e68e719a2e2c50d7..4f142c160520e887b7704969993cec9639c99f8c 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-14 Paul Jakma <paul@dishone.st>
+
+       * Not all Linux netlink systems have IFLA_WIRELESS
+
 2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * ioctl.c: (if_ioctl,if_ioctl_ipv6,if_get_flags) Replace perror with

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 0d9bbbd449a45f262cf62144571bad32c44b01aa..1d6c658cba540d0d9872ab9515e21291816f5b44 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -488,6 +488,7 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h)
   memset (tb, 0, sizeof tb);
   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))
     {
@@ -495,6 +496,7 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h)
         zlog_debug ("%s: ignoring IFLA_WIRELESS message", __func__);
       return 0;
     }
+#endif /* IFLA_WIRELESS */
 
   if (tb[IFLA_IFNAME] == NULL)
     return -1;
@@ -955,6 +957,7 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h)
   memset (tb, 0, sizeof tb);
   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))
     {
@@ -962,6 +965,7 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h)
         zlog_debug ("%s: ignoring IFLA_WIRELESS message", __func__);
       return 0;
     }
+#endif /* IFLA_WIRELESS */
   
   if (tb[IFLA_IFNAME] == NULL)
     return -1;