Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc689c97 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

usbnet: make ethtool_ops const 



The ethtool_ops table of function pointers should be const.
Fix all the usb network drivers.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3969eb38

drivers/net/usb/asix.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1152,7 +1152,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) 
	return 0;

	return 0;

}

}





static struct ethtool_ops ax88178_ethtool_ops = {

static const struct ethtool_ops ax88178_ethtool_ops = {

	.get_drvinfo		= asix_get_drvinfo,

	.get_drvinfo		= asix_get_drvinfo,

	.get_link		= asix_get_link,

	.get_link		= asix_get_link,

	.get_msglevel		= usbnet_get_msglevel,

	.get_msglevel		= usbnet_get_msglevel,

drivers/net/usb/cdc_ncm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ struct cdc_ncm_ctx { 
static void cdc_ncm_tx_timeout(unsigned long arg);

static void cdc_ncm_tx_timeout(unsigned long arg);

static const struct driver_info cdc_ncm_info;

static const struct driver_info cdc_ncm_info;

static struct usb_driver cdc_ncm_driver;

static struct usb_driver cdc_ncm_driver;

static struct ethtool_ops cdc_ncm_ethtool_ops;

static const struct ethtool_ops cdc_ncm_ethtool_ops;





static const struct usb_device_id cdc_devs[] = {

static const struct usb_device_id cdc_devs[] = {

	{ USB_INTERFACE_INFO(USB_CLASS_COMM,

	{ USB_INTERFACE_INFO(USB_CLASS_COMM,
@@ -1220,7 +1220,7 @@ static struct usb_driver cdc_ncm_driver = { 
	.supports_autosuspend = 1,

	.supports_autosuspend = 1,

};

};





static struct ethtool_ops cdc_ncm_ethtool_ops = {

static const struct ethtool_ops cdc_ncm_ethtool_ops = {

	.get_drvinfo = cdc_ncm_get_drvinfo,

	.get_drvinfo = cdc_ncm_get_drvinfo,

	.get_link = usbnet_get_link,

	.get_link = usbnet_get_link,

	.get_msglevel = usbnet_get_msglevel,

	.get_msglevel = usbnet_get_msglevel,

drivers/net/usb/ipheth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -420,7 +420,7 @@ static u32 ipheth_ethtool_op_get_link(struct net_device *net) 
	return netif_carrier_ok(dev->net);

	return netif_carrier_ok(dev->net);

}

}





static struct ethtool_ops ops = {

static const struct ethtool_ops ops = {

	.get_link = ipheth_ethtool_op_get_link

	.get_link = ipheth_ethtool_op_get_link

};

};

drivers/net/usb/sierra_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct net_device *net) 
	return sierra_net_get_private(dev)->link_up && netif_running(net);

	return sierra_net_get_private(dev)->link_up && netif_running(net);

}

}





static struct ethtool_ops sierra_net_ethtool_ops = {

static const struct ethtool_ops sierra_net_ethtool_ops = {

	.get_drvinfo = sierra_net_get_drvinfo,

	.get_drvinfo = sierra_net_get_drvinfo,

	.get_link = sierra_net_get_link,

	.get_link = sierra_net_get_link,

	.get_msglevel = usbnet_get_msglevel,

	.get_msglevel = usbnet_get_msglevel,