aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d4dcc856b3cd..7f8e5ad1b704 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -74,7 +74,7 @@ static int ethernet_phy_detect(unsigned int eth_port_num);
74static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location); 74static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
75static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val); 75static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
76static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); 76static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
77static struct ethtool_ops mv643xx_ethtool_ops; 77static const struct ethtool_ops mv643xx_ethtool_ops;
78 78
79static char mv643xx_driver_name[] = "mv643xx_eth"; 79static char mv643xx_driver_name[] = "mv643xx_eth";
80static char mv643xx_driver_version[] = "1.0"; 80static char mv643xx_driver_version[] = "1.0";
@@ -2723,7 +2723,7 @@ static void mv643xx_get_ethtool_stats(struct net_device *netdev,
2723 eth_update_mib_counters(mp); 2723 eth_update_mib_counters(mp);
2724 2724
2725 for (i = 0; i < MV643XX_STATS_LEN; i++) { 2725 for (i = 0; i < MV643XX_STATS_LEN; i++) {
2726 char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset; 2726 char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
2727 data[i] = (mv643xx_gstrings_stats[i].sizeof_stat == 2727 data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
2728 sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p; 2728 sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
2729 } 2729 }
@@ -2766,7 +2766,7 @@ static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int c
2766 return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL); 2766 return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
2767} 2767}
2768 2768
2769static struct ethtool_ops mv643xx_ethtool_ops = { 2769static const struct ethtool_ops mv643xx_ethtool_ops = {
2770 .get_settings = mv643xx_get_settings, 2770 .get_settings = mv643xx_get_settings,
2771 .set_settings = mv643xx_set_settings, 2771 .set_settings = mv643xx_set_settings,
2772 .get_drvinfo = mv643xx_get_drvinfo, 2772 .get_drvinfo = mv643xx_get_drvinfo,