diff options
| author | Riccardo Setti <giskard@autistici.org> | 2006-01-11 11:24:14 +0000 |
|---|---|---|
| committer | Riccardo Setti <giskard@autistici.org> | 2006-01-11 11:24:14 +0000 |
| commit | 458df599ae436a2324590d61624aa7489da15cfd (patch) | |
| tree | 79943ba10e50e51e9dc0e76b33cf36d6c4347adf /debian | |
| parent | 109a7976fe0363e22681d919258b3d9ce4b3bfb3 (diff) | |
added patches that fix the problem of NMDevice.c withlinux-kernel-headers >2.6.11
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@441 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/01_NMDevice.c.patch | 23 | ||||
| -rw-r--r-- | debian/patches/02_nm-netlink-monitor.patch | 11 |
2 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch new file mode 100644 index 00000000..79c72dd2 --- /dev/null +++ b/debian/patches/01_NMDevice.c.patch @@ -0,0 +1,23 @@ +--- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 ++++ ../../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; diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch new file mode 100644 index 00000000..bdc71a26 --- /dev/null +++ b/debian/patches/02_nm-netlink-monitor.patch @@ -0,0 +1,11 @@ +--- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 ++++ prova.c 2006-01-11 12:18:52.000000000 +0100 +@@ -30,7 +30,7 @@ + #include <linux/types.h> + #include <linux/netlink.h> + #include <linux/rtnetlink.h> +-#include <linux/if.h> ++#include <net/if.h> + #include <linux/unistd.h> + #include <unistd.h> + |