Commit aa3d020b authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats()

The "hi" variable is a u64 but the qca8k_read() writes to the top 32
bits of it.  That will work on little endian systems but it's a bit
subtle.  It's cleaner to make declare "hi" as a u32.  We will still need
to cast it when we shift it later on in the function but that's fine.

Fixes: 7c9896e3 ("net: dsa: qca8k: check return value of read functions correctly")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dac81152
...@@ -1412,7 +1412,7 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, ...@@ -1412,7 +1412,7 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
const struct qca8k_mib_desc *mib; const struct qca8k_mib_desc *mib;
u32 reg, i, val; u32 reg, i, val;
u64 hi = 0; u32 hi = 0;
int ret; int ret;
for (i = 0; i < ARRAY_SIZE(ar8327_mib); i++) { for (i = 0; i < ARRAY_SIZE(ar8327_mib); i++) {
...@@ -1424,14 +1424,14 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, ...@@ -1424,14 +1424,14 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
continue; continue;
if (mib->size == 2) { if (mib->size == 2) {
ret = qca8k_read(priv, reg + 4, (u32 *)&hi); ret = qca8k_read(priv, reg + 4, &hi);
if (ret < 0) if (ret < 0)
continue; continue;
} }
data[i] = val; data[i] = val;
if (mib->size == 2) if (mib->size == 2)
data[i] |= hi << 32; data[i] |= (u64)hi << 32;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment