diff -ruP ethtool-1.8-orig/amd8111e.c ethtool-1.8/amd8111e.c --- ethtool-1.8-orig/amd8111e.c Thu May 29 14:20:24 2003 +++ ethtool-1.8/amd8111e.c Tue Feb 10 12:26:34 2004 @@ -155,8 +155,8 @@ int amd8111e_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 *reg_buff = (u32 *)regs->data; - u32 reg; + __u32 *reg_buff = (__u32 *)regs->data; + __u32 reg; fprintf(stdout, "Descriptor Registers\n"); fprintf(stdout, "---------------------\n"); diff -ruP ethtool-1.8-orig/de2104x.c ethtool-1.8/de2104x.c --- ethtool-1.8-orig/de2104x.c Sun Nov 18 07:18:29 2001 +++ ethtool-1.8/de2104x.c Tue Feb 10 12:23:12 2004 @@ -82,7 +82,7 @@ }; static void -print_ring_addresses(u32 csr3, u32 csr4) +print_ring_addresses(__u32 csr3, __u32 csr4) { fprintf(stdout, "0x18: CSR3 (Rx Ring Base Address) 0x%08x\n" @@ -93,7 +93,7 @@ } static void -print_rx_missed(u32 csr8) +print_rx_missed(__u32 csr8) { fprintf(stdout, "0x40: CSR8 (Missed Frames Counter) 0x%08x\n", csr8); @@ -114,7 +114,7 @@ static void de21040_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 tmp, v, *data = (u32 *)regs->data; + __u32 tmp, v, *data = (__u32 *)regs->data; fprintf(stdout, "21040 Registers\n"); fprintf(stdout, "---------------\n"); @@ -420,7 +420,7 @@ static void de21041_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 tmp, v, *data = (u32 *)regs->data; + __u32 tmp, v, *data = (__u32 *)regs->data; fprintf(stdout, "21041 Registers\n"); fprintf(stdout, "---------------\n"); diff -ruP ethtool-1.8-orig/e100.c ethtool-1.8/e100.c --- ethtool-1.8-orig/e100.c Thu May 29 14:34:19 2003 +++ ethtool-1.8/e100.c Tue Feb 10 12:25:59 2004 @@ -39,12 +39,12 @@ int e100_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 *regs_buff = (u32 *)regs->data; - u8 version = (u8)(regs->version >> 24); - u8 rev_id = (u8)(regs->version); - u8 regs_len = regs->len / sizeof(u32); - u32 reg; - u16 scb_status, scb_cmd; + __u32 *regs_buff = (__u32 *)regs->data; + __u8 version = (__u8)(regs->version >> 24); + __u8 rev_id = (__u8)(regs->version); + __u8 regs_len = regs->len / sizeof(__u32); + __u32 reg; + __u16 scb_status, scb_cmd; if(version != 1) return -1; @@ -221,7 +221,7 @@ if(rev_id < D102_REV_ID) fprintf(stdout, "MDI\n"); else { - u16 ctrl_reg = regs_buff[1]; + __u16 ctrl_reg = regs_buff[1]; if(ctrl_reg & MDI_MDIX_CONFIG_IS_OK) { if(ctrl_reg & MDI_MDIX_STATUS) diff -ruP ethtool-1.8-orig/e1000.c ethtool-1.8/e1000.c --- ethtool-1.8-orig/e1000.c Fri Mar 28 20:25:47 2003 +++ ethtool-1.8/e1000.c Tue Feb 10 12:24:55 2004 @@ -147,7 +147,7 @@ }; static enum e1000_mac_type -e1000_get_mac_type(u16 device_id, u8 revision_id) +e1000_get_mac_type(__u16 device_id, __u8 revision_id) { enum e1000_mac_type mac_type = e1000_undefined; @@ -203,12 +203,12 @@ int e1000_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 *regs_buff = (u32 *)regs->data; - u16 hw_device_id = (u16)regs->version; - u8 hw_revision_id = (u8)(regs->version >> 16); - u8 version = (u8)(regs->version >> 24); + __u32 *regs_buff = (__u32 *)regs->data; + __u16 hw_device_id = (__u16)regs->version; + __u8 hw_revision_id = (__u8)(regs->version >> 16); + __u8 version = (__u8)(regs->version >> 24); enum e1000_mac_type mac_type; - u32 reg; + __u32 reg; if(version != 1) return -1; diff -ruP ethtool-1.8-orig/ethtool-copy.h ethtool-1.8/ethtool-copy.h --- ethtool-1.8-orig/ethtool-copy.h Sat Jul 19 08:15:26 2003 +++ ethtool-1.8/ethtool-copy.h Tue Feb 10 12:21:17 2004 @@ -15,24 +15,24 @@ /* This should work for both 32 and 64 bit userland. */ struct ethtool_cmd { - u32 cmd; - u32 supported; /* Features this interface supports */ - u32 advertising; /* Features this interface advertises */ - u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ - u8 duplex; /* Duplex, half or full */ - u8 port; /* Which connector port */ - u8 phy_address; - u8 transceiver; /* Which tranceiver to use */ - u8 autoneg; /* Enable or disable autonegotiation */ - u32 maxtxpkt; /* Tx pkts before generating tx int */ - u32 maxrxpkt; /* Rx pkts before generating rx int */ - u32 reserved[4]; + __u32 cmd; + __u32 supported; /* Features this interface supports */ + __u32 advertising; /* Features this interface advertises */ + __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ + __u8 duplex; /* Duplex, half or full */ + __u8 port; /* Which connector port */ + __u8 phy_address; + __u8 transceiver; /* Which tranceiver to use */ + __u8 autoneg; /* Enable or disable autonegotiation */ + __u32 maxtxpkt; /* Tx pkts before generating tx int */ + __u32 maxrxpkt; /* Rx pkts before generating rx int */ + __u32 reserved[4]; }; #define ETHTOOL_BUSINFO_LEN 32 /* these strings are set to whatever the driver author decides... */ struct ethtool_drvinfo { - u32 cmd; + __u32 cmd; char driver[32]; /* driver short name, "tulip", "eepro100" */ char version[32]; /* driver version string */ char fw_version[32]; /* firmware version string, if applicable */ @@ -40,53 +40,53 @@ /* For PCI devices, use pci_dev->slot_name. */ char reserved1[32]; char reserved2[16]; - u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ - u32 testinfo_len; - u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ - u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ + __u32 n_stats; /* number of __u64's from ETHTOOL_GSTATS */ + __u32 testinfo_len; + __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ + __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ }; #define SOPASS_MAX 6 /* wake-on-lan settings */ struct ethtool_wolinfo { - u32 cmd; - u32 supported; - u32 wolopts; - u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ + __u32 cmd; + __u32 supported; + __u32 wolopts; + __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ }; /* for passing single values */ struct ethtool_value { - u32 cmd; - u32 data; + __u32 cmd; + __u32 data; }; /* for passing big chunks of data */ struct ethtool_regs { - u32 cmd; - u32 version; /* driver-specific, indicates different chips/revs */ - u32 len; /* bytes */ - u8 data[0]; + __u32 cmd; + __u32 version; /* driver-specific, indicates different chips/revs */ + __u32 len; /* bytes */ + __u8 data[0]; }; /* for passing EEPROM chunks */ struct ethtool_eeprom { - u32 cmd; - u32 magic; - u32 offset; /* in bytes */ - u32 len; /* in bytes */ - u8 data[0]; + __u32 cmd; + __u32 magic; + __u32 offset; /* in bytes */ + __u32 len; /* in bytes */ + __u8 data[0]; }; /* for configuring coalescing parameters of chip */ struct ethtool_coalesce { - u32 cmd; /* ETHTOOL_{G,S}COALESCE */ + __u32 cmd; /* ETHTOOL_{G,S}COALESCE */ /* How many usecs to delay an RX interrupt after * a packet arrives. If 0, only rx_max_coalesced_frames * is used. */ - u32 rx_coalesce_usecs; + __u32 rx_coalesce_usecs; /* How many packets to delay an RX interrupt after * a packet arrives. If 0, only rx_coalesce_usecs is @@ -94,21 +94,21 @@ * to zero as this would cause RX interrupts to never be * generated. */ - u32 rx_max_coalesced_frames; + __u32 rx_max_coalesced_frames; /* Same as above two parameters, except that these values * apply while an IRQ is being services by the host. Not * all cards support this feature and the values are ignored * in that case. */ - u32 rx_coalesce_usecs_irq; - u32 rx_max_coalesced_frames_irq; + __u32 rx_coalesce_usecs_irq; + __u32 rx_max_coalesced_frames_irq; /* How many usecs to delay a TX interrupt after * a packet is sent. If 0, only tx_max_coalesced_frames * is used. */ - u32 tx_coalesce_usecs; + __u32 tx_coalesce_usecs; /* How many packets to delay a TX interrupt after * a packet is sent. If 0, only tx_coalesce_usecs is @@ -116,22 +116,22 @@ * to zero as this would cause TX interrupts to never be * generated. */ - u32 tx_max_coalesced_frames; + __u32 tx_max_coalesced_frames; /* Same as above two parameters, except that these values * apply while an IRQ is being services by the host. Not * all cards support this feature and the values are ignored * in that case. */ - u32 tx_coalesce_usecs_irq; - u32 tx_max_coalesced_frames_irq; + __u32 tx_coalesce_usecs_irq; + __u32 tx_max_coalesced_frames_irq; /* How many usecs to delay in-memory statistics * block updates. Some drivers do not have an in-memory * statistic block, and in such cases this value is ignored. * This value must not be zero. */ - u32 stats_block_coalesce_usecs; + __u32 stats_block_coalesce_usecs; /* Adaptive RX/TX coalescing is an algorithm implemented by * some drivers to improve latency under low packet rates and @@ -140,18 +140,18 @@ * not implemented by the driver causes these values to be * silently ignored. */ - u32 use_adaptive_rx_coalesce; - u32 use_adaptive_tx_coalesce; + __u32 use_adaptive_rx_coalesce; + __u32 use_adaptive_tx_coalesce; /* When the packet rate (measured in packets per second) * is below pkt_rate_low, the {rx,tx}_*_low parameters are * used. */ - u32 pkt_rate_low; - u32 rx_coalesce_usecs_low; - u32 rx_max_coalesced_frames_low; - u32 tx_coalesce_usecs_low; - u32 tx_max_coalesced_frames_low; + __u32 pkt_rate_low; + __u32 rx_coalesce_usecs_low; + __u32 rx_max_coalesced_frames_low; + __u32 tx_coalesce_usecs_low; + __u32 tx_max_coalesced_frames_low; /* When the packet rate is below pkt_rate_high but above * pkt_rate_low (both measured in packets per second) the @@ -162,43 +162,43 @@ * is above pkt_rate_high, the {rx,tx}_*_high parameters are * used. */ - u32 pkt_rate_high; - u32 rx_coalesce_usecs_high; - u32 rx_max_coalesced_frames_high; - u32 tx_coalesce_usecs_high; - u32 tx_max_coalesced_frames_high; + __u32 pkt_rate_high; + __u32 rx_coalesce_usecs_high; + __u32 rx_max_coalesced_frames_high; + __u32 tx_coalesce_usecs_high; + __u32 tx_max_coalesced_frames_high; /* How often to do adaptive coalescing packet rate sampling, * measured in seconds. Must not be zero. */ - u32 rate_sample_interval; + __u32 rate_sample_interval; }; /* for configuring RX/TX ring parameters */ struct ethtool_ringparam { - u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ + __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ /* Read only attributes. These indicate the maximum number * of pending RX/TX ring entries the driver will allow the * user to set. */ - u32 rx_max_pending; - u32 rx_mini_max_pending; - u32 rx_jumbo_max_pending; - u32 tx_max_pending; + __u32 rx_max_pending; + __u32 rx_mini_max_pending; + __u32 rx_jumbo_max_pending; + __u32 tx_max_pending; /* Values changeable by the user. The valid values are * in the range 1 to the "*_max_pending" counterpart above. */ - u32 rx_pending; - u32 rx_mini_pending; - u32 rx_jumbo_pending; - u32 tx_pending; + __u32 rx_pending; + __u32 rx_mini_pending; + __u32 rx_jumbo_pending; + __u32 tx_pending; }; /* for configuring link flow control parameters */ struct ethtool_pauseparam { - u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ + __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ /* If the link is being auto-negotiated (via ethtool_cmd.autoneg * being true) the user may set 'autonet' here non-zero to have the @@ -210,9 +210,9 @@ * then {rx,tx}_pause force the driver to use/not-use pause * flow control. */ - u32 autoneg; - u32 rx_pause; - u32 tx_pause; + __u32 autoneg; + __u32 rx_pause; + __u32 tx_pause; }; #define ETH_GSTRING_LEN 32 @@ -223,10 +223,10 @@ /* for passing string sets for data tagging */ struct ethtool_gstrings { - u32 cmd; /* ETHTOOL_GSTRINGS */ - u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ - u32 len; /* number of strings in the string set */ - u8 data[0]; + __u32 cmd; /* ETHTOOL_GSTRINGS */ + __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ + __u32 len; /* number of strings in the string set */ + __u8 data[0]; }; enum ethtool_test_flags { @@ -236,18 +236,18 @@ /* for requesting NIC test and getting results*/ struct ethtool_test { - u32 cmd; /* ETHTOOL_TEST */ - u32 flags; /* ETH_TEST_FL_xxx */ - u32 reserved; - u32 len; /* result length, in number of u64 elements */ - u64 data[0]; + __u32 cmd; /* ETHTOOL_TEST */ + __u32 flags; /* ETH_TEST_FL_xxx */ + __u32 reserved; + __u32 len; /* result length, in number of __u64 elements */ + __u64 data[0]; }; /* for dumping NIC-specific statistics */ struct ethtool_stats { - u32 cmd; /* ETHTOOL_GSTATS */ - u32 n_stats; /* number of u64's being returned */ - u64 data[0]; + __u32 cmd; /* ETHTOOL_GSTATS */ + __u32 n_stats; /* number of __u64's being returned */ + __u64 data[0]; }; /* CMDs currently supported */ diff -ruP ethtool-1.8-orig/ethtool-util.h ethtool-1.8/ethtool-util.h --- ethtool-1.8-orig/ethtool-util.h Thu May 29 14:20:24 2003 +++ ethtool-1.8/ethtool-util.h Tue Feb 10 12:27:05 2004 @@ -4,10 +4,7 @@ #define ETHTOOL_UTIL_H__ #include -typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */ -typedef __uint32_t u32; /* ditto */ -typedef __uint16_t u16; /* ditto */ -typedef __uint8_t u8; /* ditto */ +#include #include "ethtool-copy.h" /* National Semiconductor DP83815, DP83816 */ diff -ruP ethtool-1.8-orig/ethtool.c ethtool-1.8/ethtool.c --- ethtool-1.8-orig/ethtool.c Sat Jul 19 08:15:26 2003 +++ ethtool-1.8/ethtool.c Tue Feb 10 12:23:49 2004 @@ -283,9 +283,9 @@ static int xcvr_wanted = -1; static int advertising_wanted = -1; static int gset_changed = 0; /* did anything in GSET change? */ -static u32 wol_wanted = 0; +static __u32 wol_wanted = 0; static int wol_change = 0; -static u8 sopass_wanted[SOPASS_MAX]; +static __u8 sopass_wanted[SOPASS_MAX]; static int sopass_change = 0; static int gwol_changed = 0; /* did anything in GWOL change? */ static int msglvl_wanted = -1; @@ -1047,7 +1047,7 @@ for (i = 0; i < info->testinfo_len; i++) { fprintf(stdout, "%s\t %d\n", (char *)(strings->data + i * ETH_GSTRING_LEN), - (u32) test->data[i]); + (__u32) test->data[i]); } fprintf(stdout, "\n"); @@ -1802,7 +1802,7 @@ int err; struct { struct ethtool_eeprom eeprom; - u8 data; + __u8 data; } edata; edata.eeprom.cmd = ETHTOOL_SEEPROM; @@ -1835,12 +1835,12 @@ return 72; } - test = calloc(1, sizeof(*test) + drvinfo.testinfo_len * sizeof(u64)); + test = calloc(1, sizeof(*test) + drvinfo.testinfo_len * sizeof(__u64)); if (!test) { perror("Cannot allocate memory for test info"); return 73; } - memset (test->data, 0, drvinfo.testinfo_len * sizeof(u64)); + memset (test->data, 0, drvinfo.testinfo_len * sizeof(__u64)); test->cmd = ETHTOOL_TEST; test->len = drvinfo.testinfo_len; if (test_type == OFFLINE) @@ -1919,7 +1919,7 @@ } sz_str = n_stats * ETH_GSTRING_LEN; - sz_stats = n_stats * sizeof(u64); + sz_stats = n_stats * sizeof(__u64); strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings)); stats = calloc(1, sz_stats + sizeof(struct ethtool_stats)); diff -ruP ethtool-1.8-orig/natsemi.c ethtool-1.8/natsemi.c --- ethtool-1.8-orig/natsemi.c Tue Jan 21 15:56:49 2003 +++ ethtool-1.8/natsemi.c Tue Feb 10 12:24:22 2004 @@ -325,8 +325,8 @@ int natsemi_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 *data = (u32 *)regs->data; - u32 tmp; + __u32 *data = (__u32 *)regs->data; + __u32 tmp; fprintf(stdout, "Mac/BIU Registers\n"); fprintf(stdout, "-----------------\n"); @@ -966,7 +966,7 @@ natsemi_dump_eeprom(struct ethtool_drvinfo *info, struct ethtool_eeprom *ee) { int i; - u16 *eebuf = (u16 *)ee->data; + __u16 *eebuf = (__u16 *)ee->data; if (ee->magic != NATSEMI_MAGIC) { fprintf(stderr, "Magic number 0x%08x does not match 0x%08x\n", diff -ruP ethtool-1.8-orig/realtek.c ethtool-1.8/realtek.c --- ethtool-1.8-orig/realtek.c Fri Mar 28 21:30:37 2003 +++ ethtool-1.8/realtek.c Tue Feb 10 12:25:28 2004 @@ -30,7 +30,7 @@ static struct chip_info { const char *name; - u32 id_mask; + __u32 id_mask; } rtl_info_tbl[] = { { "RTL-8139", HW_REVID(1, 0, 0, 0, 0, 0, 0) }, { "RTL-8139-K", HW_REVID(1, 1, 0, 0, 0, 0, 0) }, @@ -48,7 +48,7 @@ }; static void -print_intr_bits(u16 mask) +print_intr_bits(__u16 mask) { fprintf(stdout, " %s%s%s%s%s%s%s%s%s%s%s\n", @@ -68,9 +68,9 @@ int realtek_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) { - u32 *data = (u32 *) regs->data; - u8 *data8 = (u8 *) regs->data; - u32 v; + __u32 *data = (__u32 *) regs->data; + __u8 *data8 = (__u8 *) regs->data; + __u32 v; struct chip_info *ci; unsigned int board_type = RTLNONE, i;