diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 14:30:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 14:30:00 -0400 |
commit | 7282d491ecaee9883233a0e27283c4c79486279a (patch) | |
tree | 172ffa70716f5493db57976ceef7652120b3332f /drivers/net/wireless | |
parent | 76fd85937097a0c2ec8ab23bf21dc10992d1c398 (diff) |
drivers/net: const-ify ethtool_ops declarations
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c index e386dcc32e8c..c947025d655f 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | |||
@@ -44,7 +44,7 @@ static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo * | |||
44 | strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN); | 44 | strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN); |
45 | } | 45 | } |
46 | 46 | ||
47 | struct ethtool_ops bcm43xx_ethtool_ops = { | 47 | const struct ethtool_ops bcm43xx_ethtool_ops = { |
48 | .get_drvinfo = bcm43xx_get_drvinfo, | 48 | .get_drvinfo = bcm43xx_get_drvinfo, |
49 | .get_link = ethtool_op_get_link, | 49 | .get_link = ethtool_op_get_link, |
50 | }; | 50 | }; |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h index 813704991f62..6f8d42d3cdf5 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | |||
@@ -3,6 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/ethtool.h> | 4 | #include <linux/ethtool.h> |
5 | 5 | ||
6 | extern struct ethtool_ops bcm43xx_ethtool_ops; | 6 | extern const struct ethtool_ops bcm43xx_ethtool_ops; |
7 | 7 | ||
8 | #endif /* BCM43xx_ETHTOOL_H_ */ | 8 | #endif /* BCM43xx_ETHTOOL_H_ */ |
diff --git a/drivers/net/wireless/hostap/hostap.h b/drivers/net/wireless/hostap/hostap.h index 5e63765219fe..e663518bd570 100644 --- a/drivers/net/wireless/hostap/hostap.h +++ b/drivers/net/wireless/hostap/hostap.h | |||
@@ -86,7 +86,7 @@ void hostap_info_process(local_info_t *local, struct sk_buff *skb); | |||
86 | /* hostap_ioctl.c */ | 86 | /* hostap_ioctl.c */ |
87 | 87 | ||
88 | extern const struct iw_handler_def hostap_iw_handler_def; | 88 | extern const struct iw_handler_def hostap_iw_handler_def; |
89 | extern struct ethtool_ops prism2_ethtool_ops; | 89 | extern const struct ethtool_ops prism2_ethtool_ops; |
90 | 90 | ||
91 | int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); | 91 | int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); |
92 | 92 | ||
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 8399de581893..7a4978516eac 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
@@ -3908,7 +3908,7 @@ static void prism2_get_drvinfo(struct net_device *dev, | |||
3908 | local->sta_fw_ver & 0xff); | 3908 | local->sta_fw_ver & 0xff); |
3909 | } | 3909 | } |
3910 | 3910 | ||
3911 | struct ethtool_ops prism2_ethtool_ops = { | 3911 | const struct ethtool_ops prism2_ethtool_ops = { |
3912 | .get_drvinfo = prism2_get_drvinfo | 3912 | .get_drvinfo = prism2_get_drvinfo |
3913 | }; | 3913 | }; |
3914 | 3914 | ||
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index d2db8eb412c1..b4d81a04c895 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -5911,7 +5911,7 @@ static u32 ipw2100_ethtool_get_link(struct net_device *dev) | |||
5911 | return (priv->status & STATUS_ASSOCIATED) ? 1 : 0; | 5911 | return (priv->status & STATUS_ASSOCIATED) ? 1 : 0; |
5912 | } | 5912 | } |
5913 | 5913 | ||
5914 | static struct ethtool_ops ipw2100_ethtool_ops = { | 5914 | static const struct ethtool_ops ipw2100_ethtool_ops = { |
5915 | .get_link = ipw2100_ethtool_get_link, | 5915 | .get_link = ipw2100_ethtool_get_link, |
5916 | .get_drvinfo = ipw_ethtool_get_drvinfo, | 5916 | .get_drvinfo = ipw_ethtool_get_drvinfo, |
5917 | }; | 5917 | }; |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index f29ec0ebed2f..7358664e0908 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -10461,7 +10461,7 @@ static int ipw_ethtool_set_eeprom(struct net_device *dev, | |||
10461 | return 0; | 10461 | return 0; |
10462 | } | 10462 | } |
10463 | 10463 | ||
10464 | static struct ethtool_ops ipw_ethtool_ops = { | 10464 | static const struct ethtool_ops ipw_ethtool_ops = { |
10465 | .get_link = ipw_ethtool_get_link, | 10465 | .get_link = ipw_ethtool_get_link, |
10466 | .get_drvinfo = ipw_ethtool_get_drvinfo, | 10466 | .get_drvinfo = ipw_ethtool_get_drvinfo, |
10467 | .get_eeprom_len = ipw_ethtool_get_eeprom_len, | 10467 | .get_eeprom_len = ipw_ethtool_get_eeprom_len, |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 1174ff53e025..1840b69e3cb5 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -165,7 +165,7 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00}; | |||
165 | #define MAX_RID_LEN 1024 | 165 | #define MAX_RID_LEN 1024 |
166 | 166 | ||
167 | static const struct iw_handler_def orinoco_handler_def; | 167 | static const struct iw_handler_def orinoco_handler_def; |
168 | static struct ethtool_ops orinoco_ethtool_ops; | 168 | static const struct ethtool_ops orinoco_ethtool_ops; |
169 | 169 | ||
170 | /********************************************************************/ | 170 | /********************************************************************/ |
171 | /* Data tables */ | 171 | /* Data tables */ |
@@ -4293,7 +4293,7 @@ static void orinoco_get_drvinfo(struct net_device *dev, | |||
4293 | "PCMCIA %p", priv->hw.iobase); | 4293 | "PCMCIA %p", priv->hw.iobase); |
4294 | } | 4294 | } |
4295 | 4295 | ||
4296 | static struct ethtool_ops orinoco_ethtool_ops = { | 4296 | static const struct ethtool_ops orinoco_ethtool_ops = { |
4297 | .get_drvinfo = orinoco_get_drvinfo, | 4297 | .get_drvinfo = orinoco_get_drvinfo, |
4298 | .get_link = ethtool_op_get_link, | 4298 | .get_link = ethtool_op_get_link, |
4299 | }; | 4299 | }; |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 8e112d139e29..4574290f971f 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -99,7 +99,7 @@ static int ray_dev_config(struct net_device *dev, struct ifmap *map); | |||
99 | static struct net_device_stats *ray_get_stats(struct net_device *dev); | 99 | static struct net_device_stats *ray_get_stats(struct net_device *dev); |
100 | static int ray_dev_init(struct net_device *dev); | 100 | static int ray_dev_init(struct net_device *dev); |
101 | 101 | ||
102 | static struct ethtool_ops netdev_ethtool_ops; | 102 | static const struct ethtool_ops netdev_ethtool_ops; |
103 | 103 | ||
104 | static int ray_open(struct net_device *dev); | 104 | static int ray_open(struct net_device *dev); |
105 | static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev); | 105 | static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev); |
@@ -1092,7 +1092,7 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
1092 | strcpy(info->driver, "ray_cs"); | 1092 | strcpy(info->driver, "ray_cs"); |
1093 | } | 1093 | } |
1094 | 1094 | ||
1095 | static struct ethtool_ops netdev_ethtool_ops = { | 1095 | static const struct ethtool_ops netdev_ethtool_ops = { |
1096 | .get_drvinfo = netdev_get_drvinfo, | 1096 | .get_drvinfo = netdev_get_drvinfo, |
1097 | }; | 1097 | }; |
1098 | 1098 | ||
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 561250f73fd3..0065f057bb1c 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -1837,7 +1837,7 @@ static void wl_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
1837 | strncpy(info->driver, "wavelan_cs", sizeof(info->driver)-1); | 1837 | strncpy(info->driver, "wavelan_cs", sizeof(info->driver)-1); |
1838 | } | 1838 | } |
1839 | 1839 | ||
1840 | static struct ethtool_ops ops = { | 1840 | static const struct ethtool_ops ops = { |
1841 | .get_drvinfo = wl_get_drvinfo | 1841 | .get_drvinfo = wl_get_drvinfo |
1842 | }; | 1842 | }; |
1843 | 1843 | ||
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index c03e400facee..e0d294c12970 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1464,7 +1464,7 @@ static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i | |||
1464 | strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver)); | 1464 | strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver)); |
1465 | } | 1465 | } |
1466 | 1466 | ||
1467 | static struct ethtool_ops ops = { | 1467 | static const struct ethtool_ops ops = { |
1468 | .get_drvinfo = wl3501_get_drvinfo | 1468 | .get_drvinfo = wl3501_get_drvinfo |
1469 | }; | 1469 | }; |
1470 | 1470 | ||