diff options
| author | Michael Biebl <biebl@teco.edu> | 2006-02-08 20:21:21 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@teco.edu> | 2006-02-08 20:21:21 +0000 |
| commit | 30c2c8dc0129c00b8b6b496a7fa10cb344ca4b3b (patch) | |
| tree | 77d76205ca16aa67edefe7e0a9e76b3886c970bd /debian/patches/01_NMDevice.c.patch | |
| parent | 8ed381f07ffca8445390df3ffb3e82e6f114d4b3 (diff) | |
- Removed 01-STOLEN_FROM_HEAD-dbus60.patch, fixed upstream.
- Removed 01_NMDevice.c.patch, does not apply cleanly anymore. - Removed 02_nm-netlink-monitor.patch, instead added if_fix.patch which merges the changes regarding if.h from 01_NMDevice.c.patch and 02_nm-netlink-monitor.patch into one patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@560 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches/01_NMDevice.c.patch')
| -rw-r--r-- | debian/patches/01_NMDevice.c.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch deleted file mode 100644 index a776d3ec..00000000 --- a/debian/patches/01_NMDevice.c.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 -+++ src/NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 -@@ -4283,7 +4283,7 @@ - - strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); - edata.cmd = ETHTOOL_GLINK; -- ifr.ifr_data = (char *) &edata; -+ ifr.ifr_data = (void __user *) &edata; - #ifdef IOCTL_DEBUG - nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev)); - #endif -@@ -4305,8 +4305,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ --#include <linux/mii.h> -- -+#define _LINUX_IF_H -+ #include <linux/mii.h> -+#undef _LINUX_IF_ - static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location) - { - struct mii_ioctl_data *mii; |