[Pkg-utopia-commits] r441 - packages/unstable/networkmanager/debian/patches

[Riccardo Setti]

Author: giskard-guest
Date: 2006-01-11 11:24:14 +0000 (Wed, 11 Jan 2006)
New Revision: 441

Added:
   packages/unstable/networkmanager/debian/patches/01_NMDevice.c.patch
   packages/unstable/networkmanager/debian/patches/02_nm-netlink-monitor.patch
Log:
added patches that fix the problem of NMDevice.c withlinux-kernel-headers >2.6.11

Added: packages/unstable/networkmanager/debian/patches/01_NMDevice.c.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/01_NMDevice.c.patch	2006-01-10 15:31:05 UTC (rev 440)
+++ packages/unstable/networkmanager/debian/patches/01_NMDevice.c.patch	2006-01-11 11:24:14 UTC (rev 441)
@@ -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;

Added: packages/unstable/networkmanager/debian/patches/02_nm-netlink-monitor.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/02_nm-netlink-monitor.patch	2006-01-10 15:31:05 UTC (rev 440)
+++ packages/unstable/networkmanager/debian/patches/02_nm-netlink-monitor.patch	2006-01-11 11:24:14 UTC (rev 441)
@@ -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>
+