Skip to contentSkip to conversation

ethtool: Remove duplicate type definitions

PATCH Applied Ben Hutchings 2 participants 2 messages Nov 29, 2009 – Nov 30, 2009

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 ethtool: Remove duplicate type definitions

<linux/ethtool.h> and ethtool-copy.h now include <linux/types.h>, which provides these type definitions.

The duplicate type definitions in ethtool-util.h conflict with those in <asm/types.h> on Alpha, as reported in <http://bugs.debian.org/545850>.

Signed-off-by Ben Hutchings <[email protected]>
ethtool-util.h +1 -7
@@ -5,11 +5,7 @@
 
 #include <sys/types.h>
 
-/* hack, so we may include kernel's ethtool.h */
-typedef unsigned long long __u64;
-typedef __uint32_t __u32;         /* ditto */
-typedef __uint16_t __u16;         /* ditto */
-typedef __uint8_t __u8;           /* ditto */
+#include "ethtool-copy.h"
 
 /* historical: we used to use kernel-like types; remove these once cleaned */
 typedef unsigned long long u64;

@@ -17,8 +13,6 @@
 typedef __uint16_t u16;         /* ditto */
 typedef __uint8_t u8;           /* ditto */
 
-#include "ethtool-copy.h"
-
 /* National Semiconductor DP83815, DP83816 */
 int natsemi_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
 int natsemi_dump_eeprom(struct ethtool_drvinfo *info,
Signature · 2 lines
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.