hal: Branch 'origin'

[David Zeuthen]

 hald/linux/classdev.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

New commits:
diff-tree 607bc736215bd2769d79877dda9327623637fb49 (from 025d3781e2c8fd0133934fd4c94e55d0178940c7)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Sep 13 18:42:24 2006 -0400

    don't fail, print warning if ARPHRD_IEEE80211_{RADIOTAP,PRISM} is not defined

diff --git a/hald/linux/classdev.c b/hald/linux/classdev.c
index e29a61b..5e61ce9 100644
--- a/hald/linux/classdev.c
+++ b/hald/linux/classdev.c
@@ -234,12 +234,17 @@ net_add (const gchar *sysfs_path, const 
 		hal_device_property_set_string (d, "info.product", "Networking Interface");
 		hal_device_property_set_string (d, "info.category", "net.irda");
 		hal_device_add_capability (d, "net.irda");
-	} else if (media_type == ARPHRD_IEEE80211 || media_type == ARPHRD_IEEE80211_PRISM || 
+	}
+#if defined(ARPHRD_IEEE80211_RADIOTAP) && defined(ARPHRD_IEEE80211_PRISM)
+	else if (media_type == ARPHRD_IEEE80211 || media_type == ARPHRD_IEEE80211_PRISM || 
 		   media_type == ARPHRD_IEEE80211_RADIOTAP) {
 		hal_device_property_set_string (d, "info.product", "Networking Wireless Control Interface");
 		hal_device_property_set_string (d, "info.category", "net.80211control");
 		hal_device_add_capability (d, "net.80211control");
 	}
+#else
+#warning ARPHRD_IEEE80211_RADIOTAP and/or ARPHRD_IEEE80211_PRISM not defined!
+#endif
 
 	return d;
 error: