6295d273a
Daniel Fandrich
2011-06-10
Subject
Replaced __u32 etc. with standard uint32_t style types
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/nameif.c+14 -14
| @@ -121,20 +121,20 @@ struct ethtool_drvinfo { | |
| }; | |
| 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 transceiver to use */ |
| - | __u8 autoneg; /* Enable or disable autonegotiation */ |
| - | __u32 maxtxpkt; /* Tx pkts before generating tx int */ |
| - | __u32 maxrxpkt; /* Rx pkts before generating rx int */ |
| - | __u16 speed_hi; |
| - | __u16 reserved2; |
| - | __u32 reserved[3]; |
| + | uint32_t cmd; |
| + | uint32_t supported; /* Features this interface supports */ |
| + | uint32_t advertising; /* Features this interface advertises */ |
| + | uint16_t speed; /* The forced speed, 10Mb, 100Mb, gigabit */ |
| + | uint8_t duplex; /* Duplex, half or full */ |
| + | uint8_t port; /* Which connector port */ |
| + | uint8_t phy_address; |
| + | uint8_t transceiver; /* Which transceiver to use */ |
| + | uint8_t autoneg; /* Enable or disable autonegotiation */ |
| + | uint32_t maxtxpkt; /* Tx pkts before generating tx int */ |
| + | uint32_t maxrxpkt; /* Rx pkts before generating rx int */ |
| + | uint16_t speed_hi; |
| + | uint16_t reserved2; |
| + | uint32_t reserved[3]; |
| }; | |
| #define ETHTOOL_GSET 0x00000001 /* Get settings. */ | |
networking/tc.c+10 -10
| @@ -58,10 +58,10 @@ | |
| struct globals { | |
| int filter_ifindex; | |
| - | __u32 filter_qdisc; |
| - | __u32 filter_parent; |
| - | __u32 filter_prio; |
| - | __u32 filter_proto; |
| + | uint32_t filter_qdisc; |
| + | uint32_t filter_parent; |
| + | uint32_t filter_prio; |
| + | uint32_t filter_proto; |
| } FIX_ALIASING; | |
| #define G (*(struct globals*)&bb_common_bufsiz1) | |
| struct BUG_G_too_big { | |
| @@ -94,8 +94,8 @@ static char* print_tc_classid(uint32_t cid) | |
| } | |
| /* Get a qdisc handle. Return 0 on success, !0 otherwise. */ | |
| - | static int get_qdisc_handle(__u32 *h, const char *str) { |
| - | __u32 maj; |
| + | static int get_qdisc_handle(uint32_t *h, const char *str) { |
| + | uint32_t maj; |
| char *p; | |
| maj = TC_H_UNSPEC; | |
| @@ -113,8 +113,8 @@ static int get_qdisc_handle(__u32 *h, const char *str) { | |
| } | |
| /* Get class ID. Return 0 on success, !0 otherwise. */ | |
| - | static int get_tc_classid(__u32 *h, const char *str) { |
| - | __u32 maj, min; |
| + | static int get_tc_classid(uint32_t *h, const char *str) { |
| + | uint32_t maj, min; |
| char *p; | |
| maj = TC_H_ROOT; | |
| @@ -513,7 +513,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv) | |
| if (obj == OBJ_filter) | |
| filter_parent = TC_H_ROOT; | |
| } else if (arg == ARG_parent) { | |
| - | __u32 handle; |
| + | uint32_t handle; |
| if (msg.tcm_parent) | |
| duparg(*argv, "parent"); | |
| if (get_tc_classid(&handle, *argv)) | |
| @@ -530,7 +530,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv) | |
| *slash = '\0'; | |
| */ | |
| msg.tcm_handle = get_u32(*argv, "handle"); | |
| - | /* if (slash) {if (get_u32(__u32 &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */ |
| + | /* if (slash) {if (get_u32(uint32_t &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */ |
| } else if (arg == ARG_classid && obj == OBJ_class && cmd == CMD_change){ | |
| } else if (arg == ARG_pref || arg == ARG_prio) { /* filter::list */ | |
| if (filter_prio) | |