diff options
| author | David Cantrell <dcantrell@redhat.com> | 2008-08-25 14:30:27 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2008-08-25 14:30:27 -1000 |
| commit | e139c48b7e1c870286db3439671fde2da78c3b2d (patch) | |
| tree | ad725006579cd471c035333454a443b6fae0e132 /isys | |
| parent | f103ab2a2c197604c1c254d5e894578620af61b4 (diff) | |
| download | anaconda-e139c48b7e1c870286db3439671fde2da78c3b2d.tar.gz anaconda-e139c48b7e1c870286db3439671fde2da78c3b2d.tar.xz anaconda-e139c48b7e1c870286db3439671fde2da78c3b2d.zip | |
Rename isys/net.h to isys/ethtool.h, removed unnecessary typedefs.
Removed unnecessary typedefs from isys/net.h and renamed it to
isys/ethtool.h. Updated source files accordingly.
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/ethtool.c | 2 | ||||
| -rw-r--r-- | isys/ethtool.h (renamed from isys/net.h) | 18 | ||||
| -rw-r--r-- | isys/isys.c | 2 | ||||
| -rw-r--r-- | isys/linkdetect.c | 2 |
4 files changed, 3 insertions, 21 deletions
diff --git a/isys/ethtool.c b/isys/ethtool.c index d71f81fd4..871f1d4fc 100644 --- a/isys/ethtool.c +++ b/isys/ethtool.c @@ -31,7 +31,7 @@ #include <net/if.h> #include <linux/sockios.h> -#include "net.h" +#include "ethtool.h" static int set_intf_up(struct ifreq ifr, int sock) { if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { diff --git a/isys/net.h b/isys/ethtool.h index e2f2e3a23..57b4ffcda 100644 --- a/isys/net.h +++ b/isys/ethtool.h @@ -23,24 +23,6 @@ #include <linux/types.h> #include <linux/ethtool.h> -/* type definitions so that the kernel-ish includes can be shared */ -#ifndef uint8_t -# define uint8_t unsigned char -#endif -#ifndef uint16_t -# define uint16_t unsigned short int -#endif -#ifndef uint32_t -# define uint32_t unsigned int -#endif -#ifndef uint64_t -# define uint64_t unsigned long long int -#endif -typedef uint64_t u64; -typedef uint32_t u32; -typedef uint16_t u16; -typedef uint8_t u8; - /* returns 1 for link, 0 for no link, -1 for unknown */ int get_link_status(char *ifname); diff --git a/isys/isys.c b/isys/isys.c index 32b7ef162..7b09779dc 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -76,7 +76,7 @@ #include "iface.h" #include "isys.h" #include "imount.h" -#include "net.h" +#include "ethtool.h" #include "smp.h" #include "lang.h" #include "wireless.h" diff --git a/isys/linkdetect.c b/isys/linkdetect.c index 84f77f888..fd89db351 100644 --- a/isys/linkdetect.c +++ b/isys/linkdetect.c @@ -37,7 +37,7 @@ #include <linux/sockios.h> #include <linux/mii.h> #include <linux/ethtool.h> -#include "net.h" +#include "ethtool.h" static struct ifreq ifr; |