From a00ca915ff30a5cb7372cdf145205e339873cd4a Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Fri, 9 Mar 2012 13:53:22 -0800 Subject: [PATCH] netdev: Consistently use 'enum netdev_features'. Without this patch sparse gives me warnings. At any rate, it's cleaner to be consistent. Signed-off-by: Ethan Jackson --- lib/netdev-linux.c | 18 ++++++++++-------- lib/netdev.c | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index bc486b0c..3dd5c8af 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -383,10 +383,10 @@ struct netdev_dev_linux { int get_features_error; /* Cached error code from ETHTOOL_GSET. */ int get_ifindex_error; /* Cached error code from SIOCGIFINDEX. */ - uint32_t current; /* Cached from ETHTOOL_GSET. */ - uint32_t advertised; /* Cached from ETHTOOL_GSET. */ - uint32_t supported; /* Cached from ETHTOOL_GSET. */ - uint32_t peer; /* Cached from ETHTOOL_GSET. */ + enum netdev_features current; /* Cached from ETHTOOL_GSET. */ + enum netdev_features advertised; /* Cached from ETHTOOL_GSET. */ + enum netdev_features supported; /* Cached from ETHTOOL_GSET. */ + enum netdev_features peer; /* Cached from ETHTOOL_GSET. */ struct ethtool_drvinfo drvinfo; /* Cached from ETHTOOL_GDRVINFO. */ struct tc *tc; @@ -1626,8 +1626,10 @@ out: * errno value. */ static int netdev_linux_get_features(const struct netdev *netdev_, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer) + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer) { struct netdev_dev_linux *netdev_dev = netdev_dev_linux_cast(netdev_get_dev(netdev_)); @@ -2656,7 +2658,7 @@ htb_parse_qdisc_details__(struct netdev *netdev, max_rate_s = shash_find_data(details, "max-rate"); hc->max_rate = max_rate_s ? strtoull(max_rate_s, NULL, 10) / 8 : 0; if (!hc->max_rate) { - uint32_t current; + enum netdev_features current; netdev_get_features(netdev, ¤t, NULL, NULL, NULL); hc->max_rate = netdev_features_to_bps(current) / 8; @@ -3135,7 +3137,7 @@ hfsc_parse_qdisc_details__(struct netdev *netdev, const struct shash *details, max_rate = max_rate_s ? strtoull(max_rate_s, NULL, 10) / 8 : 0; if (!max_rate) { - uint32_t current; + enum netdev_features current; netdev_get_features(netdev, ¤t, NULL, NULL, NULL); max_rate = netdev_features_to_bps(current) / 8; diff --git a/lib/netdev.c b/lib/netdev.c index 37a7d1c2..5aa30a7a 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -604,7 +604,8 @@ netdev_get_features(const struct netdev *netdev, get_features = netdev_get_dev(netdev)->netdev_class->get_features; error = get_features - ? get_features(netdev, current, advertised, supported, peer) + ? get_features(netdev, current, advertised, supported, + peer) : EOPNOTSUPP; if (error) { *current = *advertised = *supported = *peer = 0; -- 2.30.2