blob: a776d3ecd074c5e36fa0b5189b64e9841825d7e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
--- 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;
|
