From df024f3ed8bb54231cbbfcfe2d4a9babaa347073 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 11 Jan 2006 22:41:53 +0000 Subject: [PATCH] 2006-01-11 Robert Love * src/nm-device-802-3-ethernet.c: In case local copies of glibc do not define if_mii(), open code the same results, and do so without any type punning. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1320 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ configure.in | 2 +- src/nm-device-802-3-ethernet.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1ade59606..d4b30ac250 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-11 Robert Love + + * src/nm-device-802-3-ethernet.c: In case local copies of glibc do not + define if_mii(), open code the same results, and do so without any + type punning. + 2006-01-11 Robert Love * gnome/applet/wireless-security-manager.c: Fix crash by not asserting diff --git a/configure.in b/configure.in index 4fad95b088..6ba6e54cf1 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager, 0.5.1, dcbw@redhat.com, NetworkManager) +AC_INIT(NetworkManager, 0.5.1cvs20060111, dcbw@redhat.com, NetworkManager) AM_INIT_AUTOMAKE([subdir-objects]) AM_MAINTAINER_MODE diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index 5a06c0d0b5..fba24cb337 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -373,7 +373,7 @@ mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int locati iface = nm_device_get_iface (NM_DEVICE (self)); - mii = if_mii (ifr); + mii = (struct mii_ioctl_data *) &ifr->ifr_ifru; mii->reg_num = location; #ifdef IOCTL_DEBUG