aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-01-05 14:10:23 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-09 17:05:23 -0500
commitbc689c9788f2cc9829d01d84083bc1714b969b15 (patch)
tree80417749027b979ecc11875d0cdbb5cc78113713 /drivers/net/usb
parent3969eb3859e4fad4b32ca8f96d4ec8551c20704a (diff)
usbnet: make ethtool_ops const
The ethtool_ops table of function pointers should be const. Fix all the usb network drivers. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c2
-rw-r--r--drivers/net/usb/cdc_ncm.c4
-rw-r--r--drivers/net/usb/ipheth.c2
-rw-r--r--drivers/net/usb/sierra_net.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index df2b08dbbf9e..5857a404855f 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1152,7 +1152,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
1152 return 0; 1152 return 0;
1153} 1153}
1154 1154
1155static struct ethtool_ops ax88178_ethtool_ops = { 1155static const struct ethtool_ops ax88178_ethtool_ops = {
1156 .get_drvinfo = asix_get_drvinfo, 1156 .get_drvinfo = asix_get_drvinfo,
1157 .get_link = asix_get_link, 1157 .get_link = asix_get_link,
1158 .get_msglevel = usbnet_get_msglevel, 1158 .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 009dd0f18535..47fca6f7e395 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -138,7 +138,7 @@ struct cdc_ncm_ctx {
138static void cdc_ncm_tx_timeout(unsigned long arg); 138static void cdc_ncm_tx_timeout(unsigned long arg);
139static const struct driver_info cdc_ncm_info; 139static const struct driver_info cdc_ncm_info;
140static struct usb_driver cdc_ncm_driver; 140static struct usb_driver cdc_ncm_driver;
141static struct ethtool_ops cdc_ncm_ethtool_ops; 141static const struct ethtool_ops cdc_ncm_ethtool_ops;
142 142
143static const struct usb_device_id cdc_devs[] = { 143static const struct usb_device_id cdc_devs[] = {
144 { USB_INTERFACE_INFO(USB_CLASS_COMM, 144 { USB_INTERFACE_INFO(USB_CLASS_COMM,
@@ -1220,7 +1220,7 @@ static struct usb_driver cdc_ncm_driver = {
1220 .supports_autosuspend = 1, 1220 .supports_autosuspend = 1,
1221}; 1221};
1222 1222
1223static struct ethtool_ops cdc_ncm_ethtool_ops = { 1223static const struct ethtool_ops cdc_ncm_ethtool_ops = {
1224 .get_drvinfo = cdc_ncm_get_drvinfo, 1224 .get_drvinfo = cdc_ncm_get_drvinfo,
1225 .get_link = usbnet_get_link, 1225 .get_link = usbnet_get_link,
1226 .get_msglevel = usbnet_get_msglevel, 1226 .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 13c1f044b40d..a9a97c840312 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -420,7 +420,7 @@ static u32 ipheth_ethtool_op_get_link(struct net_device *net)
420 return netif_carrier_ok(dev->net); 420 return netif_carrier_ok(dev->net);
421} 421}
422 422
423static struct ethtool_ops ops = { 423static const struct ethtool_ops ops = {
424 .get_link = ipheth_ethtool_op_get_link 424 .get_link = ipheth_ethtool_op_get_link
425}; 425};
426 426
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index ed1b43210584..62534861dee6 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct net_device *net)
618 return sierra_net_get_private(dev)->link_up && netif_running(net); 618 return sierra_net_get_private(dev)->link_up && netif_running(net);
619} 619}
620 620
621static struct ethtool_ops sierra_net_ethtool_ops = { 621static const struct ethtool_ops sierra_net_ethtool_ops = {
622 .get_drvinfo = sierra_net_get_drvinfo, 622 .get_drvinfo = sierra_net_get_drvinfo,
623 .get_link = sierra_net_get_link, 623 .get_link = sierra_net_get_link,
624 .get_msglevel = usbnet_get_msglevel, 624 .get_msglevel = usbnet_get_msglevel,