hal/hald/linux2 classdev.c,1.31,1.32

Danny Kukawka dkukawka at freedesktop.org
Mon Aug 22 01:39:23 PDT 2005


Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv19006/hald/linux2

Modified Files:
	classdev.c 
Log Message:
2005-08-22  Danny Kukawka <danny.kukawka at web.de>

        * hald/linux2/classdev.c: (net_add): Fix for more informative
        info.product names for WLAN to differ between LAN and WLAN interfaces.



Index: classdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/classdev.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- classdev.c	22 Aug 2005 01:13:57 -0000	1.31
+++ classdev.c	22 Aug 2005 08:39:19 -0000	1.32
@@ -209,8 +209,6 @@
 		goto error;
 	hal_device_property_set_bool (d, "net.interface_up", flags & IFF_UP);
 
-	hal_device_property_set_string (d, "info.product", "Networking Interface");
-
 	media_type = hal_device_property_get_int (d, "net.arp_proto_hw_id");
 	if (media_type == ARPHRD_ETHER) {
 		FILE *f;
@@ -253,9 +251,11 @@
 		snprintf (wireless_path, SYSFS_PATH_MAX, "%s/wireless", sysfs_path);
 		if (stat (wireless_path, &statbuf) == 0) {
 		*/
+			hal_device_property_set_string (d, "info.product", "WLAN Interface");
 			hal_device_property_set_string (d, "info.category", "net.80211");
 			hal_device_add_capability (d, "net.80211");
 		} else {
+			hal_device_property_set_string (d, "info.product", "Networking Interface");
 			hal_device_property_set_string (d, "info.category", "net.80203");
 			hal_device_add_capability (d, "net.80203");
 		}




More information about the hal-commit mailing list