|
@@ -2313,6 +2313,8 @@ static const struct fec_stat {
|
|
{ "IEEE_rx_octets_ok", IEEE_R_OCTETS_OK },
|
|
{ "IEEE_rx_octets_ok", IEEE_R_OCTETS_OK },
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+#define FEC_STATS_SIZE (ARRAY_SIZE(fec_stats) * sizeof(u64))
|
|
|
|
+
|
|
static void fec_enet_update_ethtool_stats(struct net_device *dev)
|
|
static void fec_enet_update_ethtool_stats(struct net_device *dev)
|
|
{
|
|
{
|
|
struct fec_enet_private *fep = netdev_priv(dev);
|
|
struct fec_enet_private *fep = netdev_priv(dev);
|
|
@@ -2330,7 +2332,7 @@ static void fec_enet_get_ethtool_stats(struct net_device *dev,
|
|
if (netif_running(dev))
|
|
if (netif_running(dev))
|
|
fec_enet_update_ethtool_stats(dev);
|
|
fec_enet_update_ethtool_stats(dev);
|
|
|
|
|
|
- memcpy(data, fep->ethtool_stats, ARRAY_SIZE(fec_stats) * sizeof(u64));
|
|
|
|
|
|
+ memcpy(data, fep->ethtool_stats, FEC_STATS_SIZE);
|
|
}
|
|
}
|
|
|
|
|
|
static void fec_enet_get_strings(struct net_device *netdev,
|
|
static void fec_enet_get_strings(struct net_device *netdev,
|
|
@@ -2355,6 +2357,12 @@ static int fec_enet_get_sset_count(struct net_device *dev, int sset)
|
|
return -EOPNOTSUPP;
|
|
return -EOPNOTSUPP;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+#else /* !defined(CONFIG_M5272) */
|
|
|
|
+#define FEC_STATS_SIZE 0
|
|
|
|
+static inline void fec_enet_update_ethtool_stats(struct net_device *dev)
|
|
|
|
+{
|
|
|
|
+}
|
|
#endif /* !defined(CONFIG_M5272) */
|
|
#endif /* !defined(CONFIG_M5272) */
|
|
|
|
|
|
static int fec_enet_nway_reset(struct net_device *dev)
|
|
static int fec_enet_nway_reset(struct net_device *dev)
|
|
@@ -3293,8 +3301,7 @@ fec_probe(struct platform_device *pdev)
|
|
|
|
|
|
/* Init network device */
|
|
/* Init network device */
|
|
ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +
|
|
ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +
|
|
- ARRAY_SIZE(fec_stats) * sizeof(u64),
|
|
|
|
- num_tx_qs, num_rx_qs);
|
|
|
|
|
|
+ FEC_STATS_SIZE, num_tx_qs, num_rx_qs);
|
|
if (!ndev)
|
|
if (!ndev)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|