|
@@ -1691,7 +1691,7 @@ static int hash_get_index(__u8 *addr)
|
|
|
|
|
|
for (j = 0; j < 6; j++) {
|
|
for (j = 0; j < 6; j++) {
|
|
for (i = 0, bitval = 0; i < 8; i++)
|
|
for (i = 0, bitval = 0; i < 8; i++)
|
|
- bitval ^= hash_bit_value(i*6 + j, addr);
|
|
|
|
|
|
+ bitval ^= hash_bit_value(i * 6 + j, addr);
|
|
|
|
|
|
hash_index |= (bitval << j);
|
|
hash_index |= (bitval << j);
|
|
}
|
|
}
|
|
@@ -1832,15 +1832,15 @@ static void gem_update_stats(struct macb *bp)
|
|
|
|
|
|
for (i = 0; i < GEM_STATS_LEN; ++i, ++p) {
|
|
for (i = 0; i < GEM_STATS_LEN; ++i, ++p) {
|
|
u32 offset = gem_statistics[i].offset;
|
|
u32 offset = gem_statistics[i].offset;
|
|
- u64 val = __raw_readl(bp->regs+offset);
|
|
|
|
|
|
+ u64 val = __raw_readl(bp->regs + offset);
|
|
|
|
|
|
bp->ethtool_stats[i] += val;
|
|
bp->ethtool_stats[i] += val;
|
|
*p += val;
|
|
*p += val;
|
|
|
|
|
|
if (offset == GEM_OCTTXL || offset == GEM_OCTRXL) {
|
|
if (offset == GEM_OCTTXL || offset == GEM_OCTRXL) {
|
|
/* Add GEM_OCTTXH, GEM_OCTRXH */
|
|
/* Add GEM_OCTTXH, GEM_OCTRXH */
|
|
- val = __raw_readl(bp->regs+offset+4);
|
|
|
|
- bp->ethtool_stats[i] += ((u64)val)<<32;
|
|
|
|
|
|
+ val = __raw_readl(bp->regs + offset + 4);
|
|
|
|
+ bp->ethtool_stats[i] += ((u64)val) << 32;
|
|
*(++p) += val;
|
|
*(++p) += val;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1891,7 +1891,7 @@ static void gem_get_ethtool_stats(struct net_device *dev,
|
|
|
|
|
|
bp = netdev_priv(dev);
|
|
bp = netdev_priv(dev);
|
|
gem_update_stats(bp);
|
|
gem_update_stats(bp);
|
|
- memcpy(data, &bp->ethtool_stats, sizeof(u64)*GEM_STATS_LEN);
|
|
|
|
|
|
+ memcpy(data, &bp->ethtool_stats, sizeof(u64) * GEM_STATS_LEN);
|
|
}
|
|
}
|
|
|
|
|
|
static int gem_get_sset_count(struct net_device *dev, int sset)
|
|
static int gem_get_sset_count(struct net_device *dev, int sset)
|