colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert bogus commits

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1275 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-06 16:24:25 +00:00
parent 019a9ab116
commit d8e4dcb4a5
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nm-device-802-3-ethernet.c
View File

@@ -328,9 +328,7 @@ out:
/**************************************/ /**************************************/
/* MII capability detection */ /* MII capability detection */
/**************************************/ /**************************************/
#define _LINUX_IF_H
#include <linux/mii.h> #include <linux/mii.h>
#undef _LINUX_IF_H
static int static int
mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location)

6
src/nm-device-802-3-ethernet.h
View File

@@ -29,12 +29,6 @@
#include "nm-device.h" #include "nm-device.h"
/* define the kernel types until mii.h and ethtool.h are fixed */
#define u64 __u64
#define u32 __u32
#define u16 __u16
#define u8 __u8
G_BEGIN_DECLS G_BEGIN_DECLS
#define NM_TYPE_DEVICE_802_3_ETHERNET (nm_device_802_3_ethernet_get_type ()) #define NM_TYPE_DEVICE_802_3_ETHERNET (nm_device_802_3_ethernet_get_type ())

2
src/nm-netlink-monitor.c
View File

@@ -30,7 +30,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/if.h> #include <linux/if.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <unistd.h> #include <unistd.h>