aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-01-04 07:59:49 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-05 13:23:00 -0500
commit9b07be4b2a78166bc54c8eedf18da8a8aafacfab (patch)
tree6a1e70a5777befcd2ed840f0a8d24f6477309987
parentc8b88efc3047063f98eba26d8d08d9a6b968c73a (diff)
net: make ethtool_ops const
Auditing all usage of ethtool_ops found several drivers that are not declaring the struct const when it should be. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c2
-rw-r--r--drivers/net/ethernet/freescale/fec.c2
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c2
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c6
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 7b6b43d576d1..e83d12c7bf20 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1963,7 +1963,7 @@ static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
1963 return -EOPNOTSUPP; 1963 return -EOPNOTSUPP;
1964} 1964}
1965 1965
1966static struct ethtool_ops cxgb_ethtool_ops = { 1966static const struct ethtool_ops cxgb_ethtool_ops = {
1967 .get_settings = get_settings, 1967 .get_settings = get_settings,
1968 .set_settings = set_settings, 1968 .set_settings = set_settings,
1969 .get_drvinfo = get_drvinfo, 1969 .get_drvinfo = get_drvinfo,
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 8155cfecae19..5ca73671830b 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -1564,7 +1564,7 @@ static void cxgb4vf_get_wol(struct net_device *dev,
1564 */ 1564 */
1565#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) 1565#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
1566 1566
1567static struct ethtool_ops cxgb4vf_ethtool_ops = { 1567static const struct ethtool_ops cxgb4vf_ethtool_ops = {
1568 .get_settings = cxgb4vf_get_settings, 1568 .get_settings = cxgb4vf_get_settings,
1569 .get_drvinfo = cxgb4vf_get_drvinfo, 1569 .get_drvinfo = cxgb4vf_get_drvinfo,
1570 .get_msglevel = cxgb4vf_get_msglevel, 1570 .get_msglevel = cxgb4vf_get_msglevel,
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index b0b04453c7cc..20c2e3f3e18a 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1152,7 +1152,7 @@ static void fec_enet_get_drvinfo(struct net_device *ndev,
1152 strcpy(info->bus_info, dev_name(&ndev->dev)); 1152 strcpy(info->bus_info, dev_name(&ndev->dev));
1153} 1153}
1154 1154
1155static struct ethtool_ops fec_enet_ethtool_ops = { 1155static const struct ethtool_ops fec_enet_ethtool_ops = {
1156 .get_settings = fec_enet_get_settings, 1156 .get_settings = fec_enet_get_settings,
1157 .set_settings = fec_enet_set_settings, 1157 .set_settings = fec_enet_set_settings,
1158 .get_drvinfo = fec_enet_get_drvinfo, 1158 .get_drvinfo = fec_enet_get_drvinfo,
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index a718865a8fed..6ed09a85f035 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6607,7 +6607,7 @@ static int netdev_set_features(struct net_device *dev,
6607 return 0; 6607 return 0;
6608} 6608}
6609 6609
6610static struct ethtool_ops netdev_ethtool_ops = { 6610static const struct ethtool_ops netdev_ethtool_ops = {
6611 .get_settings = netdev_get_settings, 6611 .get_settings = netdev_get_settings,
6612 .set_settings = netdev_set_settings, 6612 .set_settings = netdev_set_settings,
6613 .nway_reset = netdev_nway_reset, 6613 .nway_reset = netdev_nway_reset,
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index ebfb682dfe55..fc9bda9bc36c 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1369,13 +1369,13 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
1369 } 1369 }
1370} 1370}
1371 1371
1372static struct ethtool_ops sh_eth_ethtool_ops = { 1372static const struct ethtool_ops sh_eth_ethtool_ops = {
1373 .get_settings = sh_eth_get_settings, 1373 .get_settings = sh_eth_get_settings,
1374 .set_settings = sh_eth_set_settings, 1374 .set_settings = sh_eth_set_settings,
1375 .nway_reset = sh_eth_nway_reset, 1375 .nway_reset = sh_eth_nway_reset,
1376 .get_msglevel = sh_eth_get_msglevel, 1376 .get_msglevel = sh_eth_get_msglevel,
1377 .set_msglevel = sh_eth_set_msglevel, 1377 .set_msglevel = sh_eth_set_msglevel,
1378 .get_link = ethtool_op_get_link, 1378 .get_link = ethtool_op_get_link,
1379 .get_strings = sh_eth_get_strings, 1379 .get_strings = sh_eth_get_strings,
1380 .get_ethtool_stats = sh_eth_get_ethtool_stats, 1380 .get_ethtool_stats = sh_eth_get_ethtool_stats,
1381 .get_sset_count = sh_eth_get_sset_count, 1381 .get_sset_count = sh_eth_get_sset_count,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index ed83c4c47b8a..9573303a706b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -459,7 +459,7 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
459 return 0; 459 return 0;
460} 460}
461 461
462static struct ethtool_ops stmmac_ethtool_ops = { 462static const struct ethtool_ops stmmac_ethtool_ops = {
463 .begin = stmmac_check_if_running, 463 .begin = stmmac_check_if_running,
464 .get_drvinfo = stmmac_ethtool_getdrvinfo, 464 .get_drvinfo = stmmac_ethtool_getdrvinfo,
465 .get_settings = stmmac_ethtool_getsettings, 465 .get_settings = stmmac_ethtool_getsettings,