[Pkg-utopia-commits] r2437 - in /packages/unstable/hal/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Oct 6 10:26:07 UTC 2008
Author: lool
Date: Mon Oct 6 10:26:06 2008
New Revision: 2437
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2437
Log:
Properly order upstream patches; use the verbatim upstream commits.
Added:
packages/unstable/hal/debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch
packages/unstable/hal/debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch
Removed:
packages/unstable/hal/debian/patches/60_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch
packages/unstable/hal/debian/patches/61_use-phy80211-instead-of-wiphy-symlink-to-detect.patch
Modified:
packages/unstable/hal/debian/changelog
Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=2437&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Mon Oct 6 10:26:06 2008
@@ -1,13 +1,12 @@
hal (0.5.11-4) UNRELEASED; urgency=low
[ Loic Minier ]
- * New patches backported and adapated from upstream, fixing support of some
- wifi chips with 2.6.27 kernels; closes: #498132, #498478.
- - 60_use-wext-ioctl-instead-of-sysfs-to-detect-wireless, fixes detection
+ * New patches from upstream git, fixing support of some wifi chips with
+ 2.6.27 kernels; closes: #498132, #498478.
+ - 60_use-phy80211-instead-of-wiphy-symlink-to-detect, fixes the sysfs
+ symlink lookup to use the proper pathname.
+ - 61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless, fixes detection
of wifi interfaces with 2.6.27 kernels.
- - 61_use-phy80211-instead-of-wiphy-symlink-to-detect, fixes the sysfs
- symlink lookup to use the proper pathname.
- - WIP: should redo the patches in proper order, cough
[ Michael Biebl ]
* Add file trigger which re-generates the hal fdi cache. (Closes: #500916)
Added: packages/unstable/hal/debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch?rev=2437&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch (added)
+++ packages/unstable/hal/debian/patches/60_use-phy80211-instead-of-wiphy-symlink-to-detect.patch Mon Oct 6 10:26:06 2008
@@ -1,0 +1,50 @@
+From d5d0b8cd48d07b5854565d9ad2c4dcc92fdda2e7 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Fri, 23 May 2008 17:29:47 +0200
+Subject: [PATCH] use 'phy80211' instead of 'wiphy' symlink to detect wireless
+
+When hal wants to determine whether a device is wireless or not,
+it looks up the 'wiphy' symlink that only existed in unreleased
+versions of cfg80211, mainline uses 'phy80211' now.
+---
+ hald/linux/device.c | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/hald/linux/device.c b/hald/linux/device.c
+index 99450d0..0760540 100644
+--- a/hald/linux/device.c
++++ b/hald/linux/device.c
+@@ -533,7 +533,7 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
+ 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 gchar *device_file, HalDevice *parent_de
+ }
+
+ 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 gchar *device_file, HalDevice *parent_de
+ 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");
+--
+1.5.6.3
+
Added: packages/unstable/hal/debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch?rev=2437&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch (added)
+++ packages/unstable/hal/debian/patches/61_use-wext-ioctl-instead-of-sysfs-to-detect-wireless.patch Mon Oct 6 10:26:06 2008
@@ -1,0 +1,72 @@
+From 41073645ea95e0bb478d6b26871a1bc4ccf832d1 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Fri, 23 May 2008 17:31:51 +0200
+Subject: [PATCH] use wext ioctl instead of sysfs to detect wireless
+
+The canonical way to check whether a network interface has wireless
+extensions is to try calling the SIOCGIWNAME ioctl on it.
+---
+ hald/linux/device.c | 16 ++++++++++++----
+ 1 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/hald/linux/device.c b/hald/linux/device.c
+index 0760540..ac242ec 100644
+--- a/hald/linux/device.c
++++ b/hald/linux/device.c
+@@ -45,6 +45,10 @@
+ #include <linux/input.h>
+ #endif
+
++/* for wireless extensions */
++#include <linux/if.h>
++#include <linux/wireless.h>
++
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
+
+@@ -532,10 +536,14 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
+ const char *addr;
+ const char *parent_subsys;
+ char bridge_path[HAL_PATH_MAX];
+- char wireless_path[HAL_PATH_MAX];
+ char phy80211_path[HAL_PATH_MAX];
+ struct stat s;
+ dbus_uint64_t mac_address = 0;
++ int ioctl_fd;
++ struct iwreq iwr;
++
++ ioctl_fd = socket (PF_INET, SOCK_DGRAM, 0);
++ strncpy (iwr.ifr_ifrn.ifrn_name, ifname, IFNAMSIZ);
+
+ addr = hal_device_property_get_string (d, "net.address");
+ if (addr != NULL) {
+@@ -554,8 +562,6 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
+ }
+
+ snprintf (bridge_path, HAL_PATH_MAX, "%s/bridge", sysfs_path);
+- /* wireless extensions */
+- snprintf (wireless_path, HAL_PATH_MAX, "%s/wireless", sysfs_path);
+ /* cfg80211 */
+ snprintf (phy80211_path, HAL_PATH_MAX, "%s/phy80211", sysfs_path);
+ parent_subsys = hal_device_property_get_string (parent_dev, "info.subsystem");
+@@ -565,7 +571,7 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
+ hal_device_property_set_string (d, "info.category", "net.bluetooth");
+ 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)) ||
++ } else if ((ioctl (ioctl_fd, SIOCGIWNAME, &iwr) == 0) ||
+ (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");
+@@ -582,6 +588,8 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
+ hal_device_add_capability (d, "net.80203");
+ hal_device_property_set_uint64 (d, "net.80203.mac_address", mac_address);
+ }
++
++ close (ioctl_fd);
+ } else if (media_type == ARPHRD_IRDA) {
+ hal_device_property_set_string (d, "info.product", "Networking Interface");
+ hal_device_property_set_string (d, "info.category", "net.irda");
+--
+1.5.6.3
+
More information about the Pkg-utopia-commits
mailing list