Attachment 16597 Details for Bug 15986 – patch to use phy80211

[patch] patch to use phy80211

hal-fix-mac80211.patch (text/plain), 1.65 KB, created by Johannes Berg on 2008-05-17 07:29:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Berg

Created: 2008-05-17 07:29:53 UTC

Size: 1.65 KB

patch

obsolete

>---
> hald/linux/device.c |    9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>--- hal.orig/hald/linux/device.c	2008-05-17 16:16:46.000000000 +0200
>+++ hal/hald/linux/device.c	2008-05-17 16:19:21.000000000 +0200
>@@ -533,7 +533,7 @@ net_add (const gchar *sysfs_path, const 
> 		const char *parent_subsys;
> 		char bridge_path[HAL_PATH_MAX];
> 		char wireless_path[HAL_PATH_MAX];
>-		char wiphy_path[HAL_PATH_MAX];
>+		char phy80211_path[HAL_PATH_MAX];
> 		struct stat s;
> 		dbus_uint64_t mac_address = 0;
> 
>@@ -554,9 +554,10 @@ net_add (const gchar *sysfs_path, const 
> 		}
> 
> 		snprintf (bridge_path, HAL_PATH_MAX, "%s/bridge", sysfs_path);
>+		/* wireless extensions */
> 		snprintf (wireless_path, HAL_PATH_MAX, "%s/wireless", sysfs_path);
>-		/* wireless dscape stack e.g. from rt2500pci driver*/
>-		snprintf (wiphy_path, HAL_PATH_MAX, "%s/wiphy", sysfs_path);
>+		/* cfg80211 */
>+		snprintf (phy80211_path, HAL_PATH_MAX, "%s/phy80211", sysfs_path);
> 		parent_subsys = hal_device_property_get_string (parent_dev, "info.subsystem");
> 
> 		if (parent_subsys && strcmp(parent_subsys, "bluetooth") == 0) {
>@@ -565,7 +566,7 @@ net_add (const gchar *sysfs_path, const 
> 			hal_device_add_capability (d, "net.bluetooth");
> 			hal_device_property_set_uint64 (d, "net.bluetooth.mac_address", mac_address);
> 		} else if ((stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) ||
>-			(stat (wiphy_path, &s) == 0 && (s.st_mode & S_IFDIR))) {
>+			(stat (phy80211_path, &s) == 0 && (s.st_mode & S_IFDIR))) {
> 			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");

Actions: View | Splinter Review

Attachments on bug 15986: 16597

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.