diff options
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/dmfe.c | 4 | ||||
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/uli526x.c | 4 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 4 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_tulip_cb.c | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 17a2ebaef58c..e1b48bd86646 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -1670,7 +1670,7 @@ static void de_get_regs(struct net_device *dev, struct ethtool_regs *regs, | |||
1670 | spin_unlock_irq(&de->lock); | 1670 | spin_unlock_irq(&de->lock); |
1671 | } | 1671 | } |
1672 | 1672 | ||
1673 | static struct ethtool_ops de_ethtool_ops = { | 1673 | static const struct ethtool_ops de_ethtool_ops = { |
1674 | .get_link = ethtool_op_get_link, | 1674 | .get_link = ethtool_op_get_link, |
1675 | .get_tx_csum = ethtool_op_get_tx_csum, | 1675 | .get_tx_csum = ethtool_op_get_tx_csum, |
1676 | .get_sg = ethtool_op_get_sg, | 1676 | .get_sg = ethtool_op_get_sg, |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 66dade556821..ccf2c225f084 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -298,7 +298,7 @@ static int dmfe_start_xmit(struct sk_buff *, struct DEVICE *); | |||
298 | static int dmfe_stop(struct DEVICE *); | 298 | static int dmfe_stop(struct DEVICE *); |
299 | static struct net_device_stats * dmfe_get_stats(struct DEVICE *); | 299 | static struct net_device_stats * dmfe_get_stats(struct DEVICE *); |
300 | static void dmfe_set_filter_mode(struct DEVICE *); | 300 | static void dmfe_set_filter_mode(struct DEVICE *); |
301 | static struct ethtool_ops netdev_ethtool_ops; | 301 | static const struct ethtool_ops netdev_ethtool_ops; |
302 | static u16 read_srom_word(long ,int); | 302 | static u16 read_srom_word(long ,int); |
303 | static irqreturn_t dmfe_interrupt(int , void *, struct pt_regs *); | 303 | static irqreturn_t dmfe_interrupt(int , void *, struct pt_regs *); |
304 | #ifdef CONFIG_NET_POLL_CONTROLLER | 304 | #ifdef CONFIG_NET_POLL_CONTROLLER |
@@ -1048,7 +1048,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1048 | dev->base_addr, dev->irq); | 1048 | dev->base_addr, dev->irq); |
1049 | } | 1049 | } |
1050 | 1050 | ||
1051 | static struct ethtool_ops netdev_ethtool_ops = { | 1051 | static const struct ethtool_ops netdev_ethtool_ops = { |
1052 | .get_drvinfo = netdev_get_drvinfo, | 1052 | .get_drvinfo = netdev_get_drvinfo, |
1053 | }; | 1053 | }; |
1054 | 1054 | ||
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 0a339dff014e..831919a81918 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -837,7 +837,7 @@ static void tulip_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in | |||
837 | strcpy(info->bus_info, pci_name(np->pdev)); | 837 | strcpy(info->bus_info, pci_name(np->pdev)); |
838 | } | 838 | } |
839 | 839 | ||
840 | static struct ethtool_ops ops = { | 840 | static const struct ethtool_ops ops = { |
841 | .get_drvinfo = tulip_get_drvinfo | 841 | .get_drvinfo = tulip_get_drvinfo |
842 | }; | 842 | }; |
843 | 843 | ||
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index c4c720e2d4c3..0b176be51eb3 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -222,7 +222,7 @@ static int uli526x_start_xmit(struct sk_buff *, struct net_device *); | |||
222 | static int uli526x_stop(struct net_device *); | 222 | static int uli526x_stop(struct net_device *); |
223 | static struct net_device_stats * uli526x_get_stats(struct net_device *); | 223 | static struct net_device_stats * uli526x_get_stats(struct net_device *); |
224 | static void uli526x_set_filter_mode(struct net_device *); | 224 | static void uli526x_set_filter_mode(struct net_device *); |
225 | static struct ethtool_ops netdev_ethtool_ops; | 225 | static const struct ethtool_ops netdev_ethtool_ops; |
226 | static u16 read_srom_word(long, int); | 226 | static u16 read_srom_word(long, int); |
227 | static irqreturn_t uli526x_interrupt(int, void *, struct pt_regs *); | 227 | static irqreturn_t uli526x_interrupt(int, void *, struct pt_regs *); |
228 | static void uli526x_descriptor_init(struct uli526x_board_info *, unsigned long); | 228 | static void uli526x_descriptor_init(struct uli526x_board_info *, unsigned long); |
@@ -985,7 +985,7 @@ static void uli526x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) | |||
985 | wol->wolopts = 0; | 985 | wol->wolopts = 0; |
986 | } | 986 | } |
987 | 987 | ||
988 | static struct ethtool_ops netdev_ethtool_ops = { | 988 | static const struct ethtool_ops netdev_ethtool_ops = { |
989 | .get_drvinfo = netdev_get_drvinfo, | 989 | .get_drvinfo = netdev_get_drvinfo, |
990 | .get_settings = netdev_get_settings, | 990 | .get_settings = netdev_get_settings, |
991 | .get_link = netdev_get_link, | 991 | .get_link = netdev_get_link, |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 264723b592cf..2fca1ee24f5a 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -339,7 +339,7 @@ static u32 __set_rx_mode(struct net_device *dev); | |||
339 | static void set_rx_mode(struct net_device *dev); | 339 | static void set_rx_mode(struct net_device *dev); |
340 | static struct net_device_stats *get_stats(struct net_device *dev); | 340 | static struct net_device_stats *get_stats(struct net_device *dev); |
341 | static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 341 | static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
342 | static struct ethtool_ops netdev_ethtool_ops; | 342 | static const struct ethtool_ops netdev_ethtool_ops; |
343 | static int netdev_close(struct net_device *dev); | 343 | static int netdev_close(struct net_device *dev); |
344 | 344 | ||
345 | 345 | ||
@@ -1447,7 +1447,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 value) | |||
1447 | debug = value; | 1447 | debug = value; |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | static struct ethtool_ops netdev_ethtool_ops = { | 1450 | static const struct ethtool_ops netdev_ethtool_ops = { |
1451 | .get_drvinfo = netdev_get_drvinfo, | 1451 | .get_drvinfo = netdev_get_drvinfo, |
1452 | .get_settings = netdev_get_settings, | 1452 | .get_settings = netdev_get_settings, |
1453 | .set_settings = netdev_set_settings, | 1453 | .set_settings = netdev_set_settings, |
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index cf43390d2c80..629eac645289 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -190,7 +190,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
190 | strcpy(info->bus_info, pci_name(private->pdev)); | 190 | strcpy(info->bus_info, pci_name(private->pdev)); |
191 | } | 191 | } |
192 | 192 | ||
193 | static struct ethtool_ops netdev_ethtool_ops = { | 193 | static const struct ethtool_ops netdev_ethtool_ops = { |
194 | .get_drvinfo = netdev_get_drvinfo, | 194 | .get_drvinfo = netdev_get_drvinfo, |
195 | }; | 195 | }; |
196 | 196 | ||
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c index d797b7b2e35f..312788caa4c6 100644 --- a/drivers/net/tulip/xircom_tulip_cb.c +++ b/drivers/net/tulip/xircom_tulip_cb.c | |||
@@ -334,7 +334,7 @@ static struct net_device_stats *xircom_get_stats(struct net_device *dev); | |||
334 | static int xircom_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 334 | static int xircom_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
335 | static void set_rx_mode(struct net_device *dev); | 335 | static void set_rx_mode(struct net_device *dev); |
336 | static void check_duplex(struct net_device *dev); | 336 | static void check_duplex(struct net_device *dev); |
337 | static struct ethtool_ops ops; | 337 | static const struct ethtool_ops ops; |
338 | 338 | ||
339 | 339 | ||
340 | /* The Xircom cards are picky about when certain bits in CSR6 can be | 340 | /* The Xircom cards are picky about when certain bits in CSR6 can be |
@@ -1430,7 +1430,7 @@ static void xircom_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i | |||
1430 | strcpy(info->bus_info, pci_name(tp->pdev)); | 1430 | strcpy(info->bus_info, pci_name(tp->pdev)); |
1431 | } | 1431 | } |
1432 | 1432 | ||
1433 | static struct ethtool_ops ops = { | 1433 | static const struct ethtool_ops ops = { |
1434 | .get_settings = xircom_get_settings, | 1434 | .get_settings = xircom_get_settings, |
1435 | .set_settings = xircom_set_settings, | 1435 | .set_settings = xircom_set_settings, |
1436 | .get_drvinfo = xircom_get_drvinfo, | 1436 | .get_drvinfo = xircom_get_drvinfo, |