More const ops cleanups
Subsystems (25)
cover More const ops cleanups
Many places were not using const when defining/using structures that only contain initialized values.
PATCH 5/5 net: file_operations should be const
All instances of file_operations should be const.
--- net/ipv6/ip6mr.c | 4 ++-- net/irda/irnet/irnet_ppp.h | 2 +- net/irda/irproc.c | 14 +++++++------- net/key/af_key.c | 2 +- net/mac80211/rc80211_minstrel_debugfs.c | 2 +- net/mac80211/rc80211_pid_debugfs.c | 2 +- net/xfrm/xfrm_proc.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)
net/ipv6/ip6mr.c +2 -2
@@ -217,7 +217,7 @@ static int ip6mr_vif_open(struct inode * sizeof(struct ipmr_vif_iter)); } -static struct file_operations ip6mr_vif_fops = { +static const struct file_operations ip6mr_vif_fops = { .owner =THIS_MODULE , .open = ip6mr_vif_open, .read = seq_read,
@@ -341,7 +341,7 @@ static int ipmr_mfc_open(struct inode *i sizeof(struct ipmr_mfc_iter)); } -static struct file_operations ip6mr_mfc_fops = { +static const struct file_operations ip6mr_mfc_fops = { .owner =THIS_MODULE , .open = ipmr_mfc_open, .read = seq_read,
net/irda/irnet/irnet_ppp.h +1 -1
@@ -95,7 +95,7 @@ static int/**************************** VARIABLES ****************************/ /* Filesystem callbacks (to call us) */ -static struct file_operations irnet_device_fops = +static const struct file_operations irnet_device_fops = { .owner =THIS_MODULE , .read = dev_irnet_read,
net/irda/irproc.c +7 -7
@@ -34,21 +34,21 @@#include <net/irda/irlap.h> #include <net/irda/irlmp.h> -extern struct file_operations discovery_seq_fops; -extern struct file_operations irlap_seq_fops; -extern struct file_operations irlmp_seq_fops; -extern struct file_operations irttp_seq_fops; -extern struct file_operations irias_seq_fops; +extern const struct file_operations discovery_seq_fops; +extern const struct file_operations irlap_seq_fops; +extern const struct file_operations irlmp_seq_fops; +extern const struct file_operations irttp_seq_fops; +extern const struct file_operations irias_seq_fops;struct irda_entry {const char *name; -struct file_operations *fops; +const struct file_operations *fops; };struct proc_dir_entry *proc_irda;EXPORT_SYMBOL (proc_irda); -static struct irda_entry irda_dirs[] = { +static const struct irda_entry irda_dirs[] = { {"discovery" , &discovery_seq_fops}, {"irttp" , &irttp_seq_fops}, {"irlmp" , &irlmp_seq_fops},
net/key/af_key.c +1 -1
@@ -3718,7 +3718,7 @@ static int pfkey_seq_open(struct inode * sizeof(struct seq_net_private)); } -static struct file_operations pfkey_proc_ops = { +static const struct file_operations pfkey_proc_ops = { .open = pfkey_seq_open, .read = seq_read, .llseek = seq_lseek,
net/mac80211/rc80211_minstrel_debugfs.c +1 -1
@@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *inoreturn 0 ; } -static struct file_operations minstrel_stat_fops = { +static const struct file_operations minstrel_stat_fops = { .owner =THIS_MODULE , .open = minstrel_stats_open, .read = minstrel_stats_read,
net/mac80211/rc80211_pid_debugfs.c +1 -1
@@ -198,7 +198,7 @@ static ssize_t rate_control_pid_events_r#undef RC_PID_PRINT_BUF_SIZE -static struct file_operations rc_pid_fop_events = { +static const struct file_operations rc_pid_fop_events = { .owner =THIS_MODULE , .read = rate_control_pid_events_read, .poll = rate_control_pid_events_poll,
net/xfrm/xfrm_proc.c +1 -1
@@ -60,7 +60,7 @@ static int xfrm_statistics_seq_open(strureturn single_open_net (inode, file, xfrm_statistics_seq_show); } -static struct file_operations xfrm_statistics_seq_fops = { +static const struct file_operations xfrm_statistics_seq_fops = { .owner =THIS_MODULE , .open = xfrm_statistics_seq_open, .read = seq_read,
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/5] net: file_operations should be const
Quoted 4 lines · Stephen Hemminger
plain text document attachment (const-file-ops.patch) All instances of
file_operationsshould be const.Signed-off-by Stephen Hemminger <[email protected]>
For the IrDA parts:
Quoted 118 lines
--- net/ipv6/ip6mr.c | 4 ++-- net/irda/irnet/irnet_ppp.h | 2 +- net/irda/irproc.c | 14 +++++++------- net/key/af_key.c | 2 +- net/mac80211/rc80211_minstrel_debugfs.c | 2 +- net/mac80211/rc80211_pid_debugfs.c | 2 +- net/xfrm/xfrm_proc.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)net/ipv6/ip6mr.c +2
-2@@ -217,7 +217,7 @@ static int ip6mr_vif_open(struct inode * sizeof(struct ipmr_vif_iter)); } -static struct file_operations ip6mr_vif_fops = { +static const struct file_operations ip6mr_vif_fops = { .owner =THIS_MODULE , .open = ip6mr_vif_open, .read = seq_read,@@ -341,7 +341,7 @@ static int ipmr_mfc_open(struct inode *i sizeof(struct ipmr_mfc_iter)); } -static struct file_operations ip6mr_mfc_fops = { +static const struct file_operations ip6mr_mfc_fops = { .owner =THIS_MODULE , .open = ipmr_mfc_open, .read = seq_read,net/irda/irnet/irnet_ppp.h +1
-1@@ -95,7 +95,7 @@ static int/**************************** VARIABLES ****************************/ /* Filesystem callbacks (to call us) */ -static struct file_operations irnet_device_fops = +static const struct file_operations irnet_device_fops = { .owner =THIS_MODULE , .read = dev_irnet_read,net/irda/irproc.c +7
-7@@ -34,21 +34,21 @@#include <net/irda/irlap.h> #include <net/irda/irlmp.h> -extern struct file_operations discovery_seq_fops; -extern struct file_operations irlap_seq_fops; -extern struct file_operations irlmp_seq_fops; -extern struct file_operations irttp_seq_fops; -extern struct file_operations irias_seq_fops; +extern const struct file_operations discovery_seq_fops; +extern const struct file_operations irlap_seq_fops; +extern const struct file_operations irlmp_seq_fops; +extern const struct file_operations irttp_seq_fops; +extern const struct file_operations irias_seq_fops;struct irda_entry {const char *name; -struct file_operations *fops; +const struct file_operations *fops; };struct proc_dir_entry *proc_irda;EXPORT_SYMBOL (proc_irda); -static struct irda_entry irda_dirs[] = { +static const struct irda_entry irda_dirs[] = { {"discovery" , &discovery_seq_fops}, {"irttp" , &irttp_seq_fops}, {"irlmp" , &irlmp_seq_fops},net/key/af_key.c +1
-1@@ -3718,7 +3718,7 @@ static int pfkey_seq_open(struct inode * sizeof(struct seq_net_private)); } -static struct file_operations pfkey_proc_ops = { +static const struct file_operations pfkey_proc_ops = { .open = pfkey_seq_open, .read = seq_read, .llseek = seq_lseek,net/mac80211/rc80211_minstrel_debugfs.c +1
-1@@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *inoreturn 0 ; } -static struct file_operations minstrel_stat_fops = { +static const struct file_operations minstrel_stat_fops = { .owner =THIS_MODULE , .open = minstrel_stats_open, .read = minstrel_stats_read,net/mac80211/rc80211_pid_debugfs.c +1
-1@@ -198,7 +198,7 @@ static ssize_t rate_control_pid_events_r#undef RC_PID_PRINT_BUF_SIZE -static struct file_operations rc_pid_fop_events = { +static const struct file_operations rc_pid_fop_events = { .owner =THIS_MODULE , .read = rate_control_pid_events_read, .poll = rate_control_pid_events_poll,net/xfrm/xfrm_proc.c +1
-1@@ -60,7 +60,7 @@ static int xfrm_statistics_seq_open(strureturn single_open_net (inode, file, xfrm_statistics_seq_show); } -static struct file_operations xfrm_statistics_seq_fops = { +static const struct file_operations xfrm_statistics_seq_fops = { .owner =THIS_MODULE , .open = xfrm_statistics_seq_open, .read = seq_read,
Re: [PATCH 5/5] net: file_operations should be const
In reply to Stephen HemmingerQuoted 3 lines · Stephen Hemminger
All instances of
file_operationsshould be const.Signed-off-by Stephen Hemminger <[email protected]>
ACK
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
PATCH 1/5 netdev: drivers should make ethtool_ops const
In reply to Stephen HemmingerNo need to put ethtool_ops in data, they should be const.
--- arch/um/drivers/net_kern.c | 2 +- drivers/firewire/net.c | 2 +- drivers/ieee1394/eth1394.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/net/arm/ep93xx_eth.c | 2 +- drivers/net/arm/ixp4xx_eth.c | 2 +- drivers/net/arm/ks8695net.c | 2 +- drivers/net/atl1c/atl1c_ethtool.c | 2 +- drivers/net/atl1e/atl1e_ethtool.c | 2 +- drivers/net/atlx/atl2.c | 2 +- drivers/net/benet/be.h | 2 +- drivers/net/benet/be_ethtool.c | 2 +- drivers/net/bfin_mac.c | 2 +- drivers/net/bnx2x_main.c | 2 +- drivers/net/enic/enic_main.c | 2 +- drivers/net/igb/igb_ethtool.c | 2 +- drivers/net/ipg.c | 2 +- drivers/net/korina.c | 2 +- drivers/net/ks8842.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/netxen/netxen_nic.h | 2 +- drivers/net/netxen/netxen_nic_ethtool.c | 2 +- drivers/net/ps3_gelic_net.c | 2 +- drivers/net/ps3_gelic_wireless.c | 2 +- drivers/net/sfc/ethtool.c | 2 +- drivers/net/tehuti.c | 2 +- drivers/net/usb/asix.c | 4 ++-- drivers/net/usb/catc.c | 2 +- drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/hso.c | 2 +- drivers/net/usb/kaweth.c | 2 +- drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/pegasus.c | 2 +- drivers/net/usb/rtl8150.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/usb/usbnet.c | 2 +- drivers/net/veth.c | 2 +- drivers/net/virtio_net.c | 2 +- drivers/net/wireless/libertas/dev.h | 2 +- drivers/net/wireless/libertas/ethtool.c | 2 +- drivers/net/xen-netfront.c | 4 ++-- drivers/s390/net/qeth_l2_main.c | 4 ++-- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/staging/at76_usb/at76_usb.c | 2 +- drivers/staging/octeon/ethernet-mdio.c | 2 +- drivers/staging/octeon/ethernet-mdio.h | 2 +- drivers/staging/sxg/sxg.h | 2 +- drivers/staging/sxg/sxg_ethtool.c | 2 +- drivers/usb/gadget/u_ether.c | 2 +- 49 files changed, 52 insertions(+), 52 deletions(-)
arch/um/drivers/net_kern.c +1 -1
@@ -285,7 +285,7 @@ static void uml_net_get_drvinfo(struct nstrcpy (info->version,"42" ); } -static struct ethtool_ops uml_net_ethtool_ops = { +static const struct ethtool_ops uml_net_ethtool_ops = { .get_drvinfo = uml_net_get_drvinfo, .get_link = ethtool_op_get_link, };
drivers/firewire/net.c +1 -1
@@ -1342,7 +1342,7 @@ static void fwnet_get_drvinfo(struct netstrcpy (info->bus_info,"ieee1394" ); } -static struct ethtool_ops fwnet_ethtool_ops = { +static const struct ethtool_ops fwnet_ethtool_ops = { .get_drvinfo = fwnet_get_drvinfo, };
drivers/ieee1394/eth1394.c +1 -1
@@ -173,7 +173,7 @@ static netdev_tx_t ether1394_tx(struct s struct net_device *dev);static void ether1394_iso (struct hpsb_iso *iso); -static struct ethtool_ops ethtool_ops; +static const struct ethtool_ops ethtool_ops;static int ether1394_write (struct hpsb_host *host,int srcid,int destid,quadlet_t *data,u64 addr,size_t len,u16 flags);
drivers/infiniband/hw/nes/nes_nic.c +1 -1
@@ -1508,7 +1508,7 @@ static int nes_netdev_set_settings(struc } -static struct ethtool_ops nes_ethtool_ops = { +static const struct ethtool_ops nes_ethtool_ops = { .get_link = ethtool_op_get_link, .get_settings = nes_netdev_get_settings, .set_settings = nes_netdev_set_settings,
drivers/net/arm/ep93xx_eth.c +1 -1
@@ -762,7 +762,7 @@ static u32 ep93xx_get_link(struct net_dereturn mii_link_ok (&ep->mii); } -static struct ethtool_ops ep93xx_ethtool_ops = { +static const struct ethtool_ops ep93xx_ethtool_ops = { .get_drvinfo = ep93xx_get_drvinfo, .get_settings = ep93xx_get_settings, .set_settings = ep93xx_set_settings,
drivers/net/arm/ixp4xx_eth.c +1 -1
@@ -802,7 +802,7 @@ static int ixp4xx_nway_reset(struct net_return phy_start_aneg (port->phydev); } -static struct ethtool_ops ixp4xx_ethtool_ops = { +static const struct ethtool_ops ixp4xx_ethtool_ops = { .get_drvinfo = ixp4xx_get_drvinfo, .get_settings = ixp4xx_get_settings, .set_settings = ixp4xx_set_settings,
drivers/net/arm/ks8695net.c +1 -1
@@ -1063,7 +1063,7 @@ ks8695_get_drvinfo(struct net_device *nd sizeof(info->bus_info)); } -static struct ethtool_ops ks8695_ethtool_ops = { +static const struct ethtool_ops ks8695_ethtool_ops = { .get_msglevel = ks8695_get_msglevel, .set_msglevel = ks8695_set_msglevel, .get_settings = ks8695_get_settings,
drivers/net/atl1c/atl1c_ethtool.c +1 -1
@@ -294,7 +294,7 @@ static int atl1c_nway_reset(struct net_dreturn 0 ; } -static struct ethtool_ops atl1c_ethtool_ops = { +static const struct ethtool_ops atl1c_ethtool_ops = { .get_settings = atl1c_get_settings, .set_settings = atl1c_set_settings, .get_drvinfo = atl1c_get_drvinfo,
drivers/net/atl1e/atl1e_ethtool.c +1 -1
@@ -378,7 +378,7 @@ static int atl1e_nway_reset(struct net_dreturn 0 ; } -static struct ethtool_ops atl1e_ethtool_ops = { +static const struct ethtool_ops atl1e_ethtool_ops = { .get_settings = atl1e_get_settings, .set_settings = atl1e_set_settings, .get_drvinfo = atl1e_get_drvinfo,
drivers/net/atlx/atl2.c +1 -1
@@ -2094,7 +2094,7 @@ static int atl2_nway_reset(struct net_dereturn 0 ; } -static struct ethtool_ops atl2_ethtool_ops = { +static const struct ethtool_ops atl2_ethtool_ops = { .get_settings = atl2_get_settings, .set_settings = atl2_set_settings, .get_drvinfo = atl2_get_drvinfo,
drivers/net/benet/be.h +1 -1
@@ -259,7 +259,7 @@ struct be_adapter {bool promiscuous; }; -extern struct ethtool_ops be_ethtool_ops; +extern const struct ethtool_ops be_ethtool_ops;#define drvr_stats (adapter) (&adapter->stats.drvr_stats)
drivers/net/benet/be_ethtool.c +1 -1
@@ -332,7 +332,7 @@ be_set_pauseparam(struct net_device *netreturn status; } -struct ethtool_ops be_ethtool_ops = { +const struct ethtool_ops be_ethtool_ops = { .get_settings = be_get_settings, .get_drvinfo = be_get_drvinfo, .get_link = ethtool_op_get_link,
drivers/net/bfin_mac.c +1 -1
@@ -491,7 +491,7 @@ static void bfin_mac_ethtool_getdrvinfo(strcpy (info->bus_info,dev_name (&dev->dev)); } -static struct ethtool_ops bfin_mac_ethtool_ops = { +static const struct ethtool_ops bfin_mac_ethtool_ops = { .get_settings = bfin_mac_ethtool_getsettings, .set_settings = bfin_mac_ethtool_setsettings, .get_link = ethtool_op_get_link,
drivers/net/bnx2x_main.c +1 -1
@@ -10606,7 +10606,7 @@ static int bnx2x_phys_id(struct net_devireturn 0 ; } -static struct ethtool_ops bnx2x_ethtool_ops = { +static const struct ethtool_ops bnx2x_ethtool_ops = { .get_settings = bnx2x_get_settings, .set_settings = bnx2x_set_settings, .get_drvinfo = bnx2x_get_drvinfo,
drivers/net/enic/enic_main.c +1 -1
@@ -256,7 +256,7 @@ static void enic_set_msglevel(struct net enic->msg_enable = value; } -static struct ethtool_ops enic_ethtool_ops = { +static const struct ethtool_ops enic_ethtool_ops = { .get_settings = enic_get_settings, .get_drvinfo = enic_get_drvinfo, .get_msglevel = enic_get_msglevel,
drivers/net/igb/igb_ethtool.c +1 -1
@@ -2016,7 +2016,7 @@ static void igb_get_strings(struct net_d } } -static struct ethtool_ops igb_ethtool_ops = { +static const struct ethtool_ops igb_ethtool_ops = { .get_settings = igb_get_settings, .set_settings = igb_set_settings, .get_drvinfo = igb_get_drvinfo,
drivers/net/ipg.c +1 -1
@@ -2186,7 +2186,7 @@ static int ipg_nway_reset(struct net_devreturn rc; } -static struct ethtool_ops ipg_ethtool_ops = { +static const struct ethtool_ops ipg_ethtool_ops = { .get_settings = ipg_get_settings, .set_settings = ipg_set_settings, .nway_reset = ipg_nway_reset,
drivers/net/korina.c +1 -1
@@ -743,7 +743,7 @@ static u32 netdev_get_link(struct net_dereturn mii_link_ok (&lp->mii_if); } -static struct ethtool_ops netdev_ethtool_ops = { +static const struct ethtool_ops netdev_ethtool_ops = { .get_drvinfo = netdev_get_drvinfo, .get_settings = netdev_get_settings, .set_settings = netdev_set_settings,
drivers/net/ks8842.c +1 -1
@@ -619,7 +619,7 @@ static const struct net_device_ops ks884 .ndo_validate_addr = eth_validate_addr }; -static struct ethtool_ops ks8842_ethtool_ops = { +static const struct ethtool_ops ks8842_ethtool_ops = { .get_link = ethtool_op_get_link, };
drivers/net/macb.c +1 -1
@@ -1079,7 +1079,7 @@ static void macb_get_drvinfo(struct net_strcpy (info->bus_info,dev_name (&bp->pdev->dev)); } -static struct ethtool_ops macb_ethtool_ops = { +static const struct ethtool_ops macb_ethtool_ops = { .get_settings = macb_get_settings, .set_settings = macb_set_settings, .get_drvinfo = macb_get_drvinfo,
drivers/net/netxen/netxen_nic.h +1 -1
@@ -1410,6 +1410,6 @@ extern void netxen_change_ringparam(struextern int netxen_rom_fast_read (struct netxen_adapter *adapter,int addr,int *valp); -extern struct ethtool_ops netxen_nic_ethtool_ops; +extern const struct ethtool_ops netxen_nic_ethtool_ops;#endif /* __NETXEN_NIC_H_ */
drivers/net/netxen/netxen_nic_ethtool.c +1 -1
@@ -963,7 +963,7 @@ static int netxen_nic_set_flags(struct nreturn 0 ; } -struct ethtool_ops netxen_nic_ethtool_ops = { +const struct ethtool_ops netxen_nic_ethtool_ops = { .get_settings = netxen_nic_get_settings, .set_settings = netxen_nic_set_settings, .get_drvinfo = netxen_nic_get_drvinfo,
drivers/net/ps3_gelic_net.c +1 -1
@@ -1346,7 +1346,7 @@ done:return status; } -static struct ethtool_ops gelic_ether_ethtool_ops = { +static const struct ethtool_ops gelic_ether_ethtool_ops = { .get_drvinfo = gelic_net_get_drvinfo, .get_settings = gelic_ether_get_settings, .get_link = ethtool_op_get_link,
drivers/net/ps3_gelic_wireless.c +1 -1
@@ -2714,7 +2714,7 @@ static const struct net_device_ops gelic#endif }; -static struct ethtool_ops gelic_wl_ethtool_ops = { +static const struct ethtool_ops gelic_wl_ethtool_ops = { .get_drvinfo = gelic_net_get_drvinfo, .get_link = gelic_wl_get_link, .get_tx_csum = ethtool_op_get_tx_csum,
drivers/net/sfc/ethtool.c +1 -1
@@ -731,7 +731,7 @@ static void efx_ethtool_get_pauseparam(s } -struct ethtool_ops efx_ethtool_ops = { +const struct ethtool_ops efx_ethtool_ops = { .get_settings = efx_ethtool_get_settings, .set_settings = efx_ethtool_set_settings, .get_drvinfo = efx_ethtool_get_drvinfo,
drivers/net/tehuti.c +1 -1
@@ -2428,7 +2428,7 @@ static void bdx_get_ethtool_stats(struct*/ static void bdx_ethtool_ops (struct net_device *netdev) { -static struct ethtool_ops bdx_ethtool_ops = { +static const struct ethtool_ops bdx_ethtool_ops = { .get_settings = bdx_get_settings, .get_drvinfo = bdx_get_drvinfo, .get_link = ethtool_op_get_link,
drivers/net/usb/asix.c +2 -2
@@ -731,7 +731,7 @@ static int asix_ioctl (struct net_device/* We need to override some ethtool_ops so we require our own structure so we don't interfere with other usbnet devices that may be connected at the same time. */ -static struct ethtool_ops ax88172_ethtool_ops = { +static const struct ethtool_ops ax88172_ethtool_ops = { .get_drvinfo = asix_get_drvinfo, .get_link = asix_get_link, .get_msglevel = usbnet_get_msglevel,
@@ -873,7 +873,7 @@ out:return ret; } -static struct ethtool_ops ax88772_ethtool_ops = { +static const struct ethtool_ops ax88772_ethtool_ops = { .get_drvinfo = asix_get_drvinfo, .get_link = asix_get_link, .get_msglevel = usbnet_get_msglevel,
drivers/net/usb/catc.c +1 -1
@@ -698,7 +698,7 @@ static int catc_get_settings(struct net_return 0 ; } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = catc_get_drvinfo, .get_settings = catc_get_settings, .get_link = ethtool_op_get_link
drivers/net/usb/dm9601.c +1 -1
@@ -356,7 +356,7 @@ static int dm9601_ioctl(struct net_devicreturn generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); } -static struct ethtool_ops dm9601_ethtool_ops = { +static const struct ethtool_ops dm9601_ethtool_ops = { .get_drvinfo = dm9601_get_drvinfo, .get_link = dm9601_get_link, .get_msglevel = usbnet_get_msglevel,
drivers/net/usb/hso.c +1 -1
@@ -829,7 +829,7 @@ static void hso_get_drvinfo(struct net_dusb_make_path (odev->parent->usb, info->bus_info,sizeof info->bus_info); } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = hso_get_drvinfo, .get_link = ethtool_op_get_link };
drivers/net/usb/kaweth.c +1 -1
@@ -778,7 +778,7 @@ static u32 kaweth_get_link(struct net_dereturn kaweth->linkstate; } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = kaweth_get_drvinfo, .get_link = kaweth_get_link };
drivers/net/usb/mcs7830.c +1 -1
@@ -449,7 +449,7 @@ static void mcs7830_get_regs(struct net_mcs7830_get_reg (dev,0 , regs->len, data); } -static struct ethtool_ops mcs7830_ethtool_ops = { +static const struct ethtool_ops mcs7830_ethtool_ops = { .get_drvinfo = mcs7830_get_drvinfo, .get_regs_len = mcs7830_get_regs_len, .get_regs = mcs7830_get_regs,
drivers/net/usb/pegasus.c +1 -1
@@ -1174,7 +1174,7 @@ static void pegasus_set_msglevel(struct pegasus->msg_enable = v; } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = pegasus_get_drvinfo, .get_settings = pegasus_get_settings, .set_settings = pegasus_set_settings,
drivers/net/usb/rtl8150.c +1 -1
@@ -865,7 +865,7 @@ static int rtl8150_get_settings(struct nreturn 0 ; } -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = rtl8150_get_drvinfo, .get_settings = rtl8150_get_settings, .get_link = ethtool_op_get_link
drivers/net/usb/smsc95xx.c +1 -1
@@ -625,7 +625,7 @@ static int smsc95xx_ethtool_set_tx_csum(return smsc95xx_set_csums (dev); } -static struct ethtool_ops smsc95xx_ethtool_ops = { +static const struct ethtool_ops smsc95xx_ethtool_ops = { .get_link = usbnet_get_link, .nway_reset = usbnet_nway_reset, .get_drvinfo = usbnet_get_drvinfo,
drivers/net/usb/usbnet.c +1 -1
@@ -854,7 +854,7 @@ void usbnet_set_msglevel (struct net_devEXPORT_SYMBOL_GPL (usbnet_set_msglevel);/* drivers may override default ethtool_ops in their bind() routine */ -static struct ethtool_ops usbnet_ethtool_ops = { +static const struct ethtool_ops usbnet_ethtool_ops = { .get_settings = usbnet_get_settings, .set_settings = usbnet_set_settings, .get_link = usbnet_get_link,
drivers/net/veth.c +1 -1
@@ -129,7 +129,7 @@ static int veth_set_tx_csum(struct net_dreturn 0 ; } -static struct ethtool_ops veth_ethtool_ops = { +static const struct ethtool_ops veth_ethtool_ops = { .get_settings = veth_get_settings, .get_drvinfo = veth_get_drvinfo, .get_link = ethtool_op_get_link,
drivers/net/virtio_net.c +1 -1
@@ -798,7 +798,7 @@ static void virtnet_vlan_rx_kill_vid(strdev_warn (&dev->dev,"Failed to kill VLAN ID %d.\n" , vid); } -static struct ethtool_ops virtnet_ethtool_ops = { +static const struct ethtool_ops virtnet_ethtool_ops = { .set_tx_csum = virtnet_set_tx_csum, .set_sg = ethtool_op_set_sg, .set_tso = ethtool_op_set_tso,
drivers/net/wireless/libertas/dev.h +1 -1
@@ -14,7 +14,7 @@#include "defs.h" #include "hostcmd.h" -extern struct ethtool_ops lbs_ethtool_ops; +extern const struct ethtool_ops lbs_ethtool_ops;#define MAX_BSSID_PER_CHANNEL 16
drivers/net/wireless/libertas/ethtool.c +1 -1
@@ -183,7 +183,7 @@ static int lbs_ethtool_set_wol(struct nereturn lbs_host_sleep_cfg (priv, criteria, (struct wol_config *)NULL ); } -struct ethtool_ops lbs_ethtool_ops = { +const struct ethtool_ops lbs_ethtool_ops = { .get_drvinfo = lbs_ethtool_get_drvinfo, .get_eeprom = lbs_ethtool_get_eeprom, .get_eeprom_len = lbs_ethtool_get_eeprom_len,
drivers/net/xen-netfront.c +2 -2
@@ -51,7 +51,7 @@#include <xen/interface/memory.h> #include <xen/interface/grant_table.h> -static struct ethtool_ops xennet_ethtool_ops; +static const struct ethtool_ops xennet_ethtool_ops;struct netfront_cb {struct page *page;
@@ -1627,7 +1627,7 @@ static void backend_changed(struct xenbu } } -static struct ethtool_ops xennet_ethtool_ops = +static const struct ethtool_ops xennet_ethtool_ops = { .set_tx_csum = ethtool_op_set_tx_csum, .set_sg = xennet_set_sg,
drivers/s390/net/qeth_l2_main.c +2 -2
@@ -863,7 +863,7 @@ static void qeth_l2_remove_device(structreturn ; } -static struct ethtool_ops qeth_l2_ethtool_ops = { +static const struct ethtool_ops qeth_l2_ethtool_ops = { .get_link = ethtool_op_get_link, .get_strings = qeth_core_get_strings, .get_ethtool_stats = qeth_core_get_ethtool_stats,
@@ -872,7 +872,7 @@ static struct ethtool_ops qeth_l2_ethtoo .get_settings = qeth_core_ethtool_get_settings, }; -static struct ethtool_ops qeth_l2_osn_ops = { +static const struct ethtool_ops qeth_l2_osn_ops = { .get_strings = qeth_core_get_strings, .get_ethtool_stats = qeth_core_get_ethtool_stats, .get_stats_count = qeth_core_get_stats_count,
drivers/s390/net/qeth_l3_main.c +1 -1
@@ -2946,7 +2946,7 @@ static int qeth_l3_ethtool_set_tso(strucreturn 0 ; } -static struct ethtool_ops qeth_l3_ethtool_ops = { +static const struct ethtool_ops qeth_l3_ethtool_ops = { .get_link = ethtool_op_get_link, .get_tx_csum = ethtool_op_get_tx_csum, .set_tx_csum = ethtool_op_set_tx_hw_csum,
drivers/staging/at76_usb/at76_usb.c +1 -1
@@ -3396,7 +3396,7 @@ static u32 at76_ethtool_get_link(structreturn priv->mac_state ==MAC_CONNECTED ; } -static struct ethtool_ops at76_ethtool_ops = { +static const struct ethtool_ops at76_ethtool_ops = { .get_drvinfo = at76_ethtool_get_drvinfo, .get_link = at76_ethtool_get_link, };
drivers/staging/octeon/ethernet-mdio.c +1 -1
@@ -170,7 +170,7 @@ static u32 cvm_oct_get_link(struct net_dreturn ret; } -struct ethtool_ops cvm_oct_ethtool_ops = { +struct const ethtool_ops cvm_oct_ethtool_ops = { .get_drvinfo = cvm_oct_get_drvinfo, .get_settings = cvm_oct_get_settings, .set_settings = cvm_oct_set_settings,
drivers/staging/octeon/ethernet-mdio.h +1 -1
@@ -41,6 +41,6 @@#include <net/xfrm.h> #endif /* CONFIG_XFRM */ -extern struct ethtool_ops cvm_oct_ethtool_ops; +extern const struct ethtool_ops cvm_oct_ethtool_ops;int cvm_oct_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);int cvm_oct_mdio_setup_device (struct net_device *dev);
drivers/staging/sxg/sxg.h +1 -1
@@ -782,6 +782,6 @@ struct slic_crash_info {#define SIOCSLICSETINTAGG (SIOCDEVPRIVATE+10)#define SIOCSLICTRACEDUMP (SIOCDEVPRIVATE+11) -extern struct ethtool_ops sxg_nic_ethtool_ops; +extern const struct ethtool_ops sxg_nic_ethtool_ops;#define SXG_COMPLETE_SLOW_SEND_LIMIT 128#endif /* __SXG_DRIVER_H__ */
drivers/staging/sxg/sxg_ethtool.c +1 -1
@@ -300,7 +300,7 @@ static int sxg_nic_get_eeprom(struct netreturn 0 ; } -struct ethtool_ops sxg_nic_ethtool_ops = { +const struct ethtool_ops sxg_nic_ethtool_ops = { .get_settings = sxg_nic_get_settings, .set_settings = sxg_nic_set_settings, .get_drvinfo = sxg_nic_get_drvinfo,
drivers/usb/gadget/u_ether.c +1 -1
@@ -181,7 +181,7 @@ static void eth_get_drvinfo(struct net_d* - ... probably more ethtool ops */ -static struct ethtool_ops ops = { +static const struct ethtool_ops ops = { .get_drvinfo = eth_get_drvinfo, .get_link = ethtool_op_get_link, };
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 1/5] netdev: drivers should make ethtool_ops const
Quoted 3 lines · Stephen Hemminger
No need to put
ethtool_opsin data, they should be const.Signed-off-by Stephen Hemminger <[email protected]>
ACK
Signature · 6 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/5 net: seq_operations should be const
In reply to Stephen Hemminger--- net/ipv6/ip6mr.c | 2 +- net/key/af_key.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ip6mr.c +1 -1
@@ -204,7 +204,7 @@ static int ip6mr_vif_seq_show(struct seqreturn 0 ; } -static struct seq_operations ip6mr_vif_seq_ops = { +static const struct seq_operations ip6mr_vif_seq_ops = { .start = ip6mr_vif_seq_start, .next = ip6mr_vif_seq_next, .stop = ip6mr_vif_seq_stop,
net/key/af_key.c +1 -1
@@ -3705,7 +3705,7 @@ static void pfkey_seq_stop(struct seq_firead_unlock (&pfkey_table_lock); } -static struct seq_operations pfkey_seq_ops = { +static const struct seq_operations pfkey_seq_ops = { .start = pfkey_seq_start, .next = pfkey_seq_next, .stop = pfkey_seq_stop,
PATCH 3/5 tcp: MD5 operations should be const
In reply to Stephen Hemminger--- include/linux/tcp.h | 6 +++--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv6/tcp_ipv6.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-)
include/linux/tcp.h +3 -3
@@ -233,7 +233,7 @@ struct tcp_request_sock {struct inet_request_sock req;#ifdef CONFIG_TCP_MD5SIG /* Only used by TCP MD5 Signature so far. */ -struct tcp_request_sock_ops *af_specific; +const struct tcp_request_sock_ops *af_specific;#endif u32 rcv_isn;u32 snt_isn;
@@ -401,9 +401,9 @@ struct tcp_sock {#ifdef CONFIG_TCP_MD5SIG /* TCP AF-Specific parts; only used by MD5 Signature support so far */ -struct tcp_sock_af_ops *af_specific; +const struct tcp_sock_af_ops *af_specific; -/* TCP MD5 Signagure Option information */ +/* TCP MD5 Signature Option information */ struct tcp_md5sig_info *md5sig_info;#endif };
net/ipv4/tcp_ipv4.c +2 -2
@@ -1195,7 +1195,7 @@ struct request_sock_ops tcp_request_sock };#ifdef CONFIG_TCP_MD5SIG -static struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { +static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { .md5_lookup = tcp_v4_reqsk_md5_lookup, .calc_md5_hash = tcp_v4_md5_hash_skb, };
@@ -1774,7 +1774,7 @@ struct inet_connection_sock_af_ops ipv4_ };#ifdef CONFIG_TCP_MD5SIG -static struct tcp_sock_af_ops tcp_sock_ipv4_specific = { +static const struct tcp_sock_af_ops tcp_sock_ipv4_specific = { .md5_lookup = tcp_v4_md5_lookup, .calc_md5_hash = tcp_v4_md5_hash_skb, .md5_add = tcp_v4_md5_add_func,
net/ipv6/tcp_ipv6.c +5 -5
@@ -78,8 +78,8 @@ static int tcp_v6_do_rcv(struct sock *skstatic struct inet_connection_sock_af_ops ipv6_mapped;static struct inet_connection_sock_af_ops ipv6_specific;#ifdef CONFIG_TCP_MD5SIG -static struct tcp_sock_af_ops tcp_sock_ipv6_specific; -static struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific; +static const struct tcp_sock_af_ops tcp_sock_ipv6_specific; +static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific;#else static struct tcp_md5sig_key *tcp_v6_md5_do_lookup (struct sock *sk,struct in6_addr *addr)
@@ -894,7 +894,7 @@ struct request_sock_ops tcp6_request_soc };#ifdef CONFIG_TCP_MD5SIG -static struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { +static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { .md5_lookup = tcp_v6_reqsk_md5_lookup, .calc_md5_hash = tcp_v6_md5_hash_skb, };
@@ -1780,7 +1780,7 @@ static struct inet_connection_sock_af_op };#ifdef CONFIG_TCP_MD5SIG -static struct tcp_sock_af_ops tcp_sock_ipv6_specific = { +static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = { .md5_lookup = tcp_v6_md5_lookup, .calc_md5_hash = tcp_v6_md5_hash_skb, .md5_add = tcp_v6_md5_add_func,
@@ -1812,7 +1812,7 @@ static struct inet_connection_sock_af_op };#ifdef CONFIG_TCP_MD5SIG -static struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = { +static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = { .md5_lookup = tcp_v4_md5_lookup, .calc_md5_hash = tcp_v4_md5_hash_skb, .md5_add = tcp_v6_md5_add_func,
PATCH 4/5 inet: inet_connection_sock_af_ops const
In reply to Stephen HemmingerThe function block inet_connect_sock_af_ops contains no data make it constant.
--- include/net/transp_v6.h | 2 +- net/dccp/ipv4.c | 2 +- net/dccp/ipv6.c | 8 ++++---- net/ipv4/tcp_ipv4.c | 2 +- net/ipv6/tcp_ipv6.c | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-)
net/dccp/ipv4.c +1 -1
@@ -880,7 +880,7 @@ discard_and_relse: goto discard_it; } -static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { +static const struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { .queue_xmit = ip_queue_xmit, .send_check = dccp_v4_send_check, .rebuild_header = inet_sk_rebuild_header,
net/dccp/ipv6.c +4 -4
@@ -35,8 +35,8 @@/* The per-net dccp.v6_ctl_sk is used for sending RSTs and ACKs */ -static struct inet_connection_sock_af_ops dccp_ipv6_mapped; -static struct inet_connection_sock_af_ops dccp_ipv6_af_ops; +static const struct inet_connection_sock_af_ops dccp_ipv6_mapped; +static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops;static void dccp_v6_hash (struct sock *sk) {
@@ -1055,7 +1055,7 @@ failure:return err; } -static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = { +static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops = { .queue_xmit = inet6_csk_xmit, .send_check = dccp_v6_send_check, .rebuild_header = inet6_sk_rebuild_header,
@@ -1076,7 +1076,7 @@ static struct inet_connection_sock_af_op/* * DCCP over IPv4 via INET6 API */ -static struct inet_connection_sock_af_ops dccp_ipv6_mapped = { +static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = { .queue_xmit = ip_queue_xmit, .send_check = dccp_v4_send_check, .rebuild_header = inet_sk_rebuild_header,
net/ipv4/tcp_ipv4.c +1 -1
@@ -1754,7 +1754,7 @@ int tcp_v4_tw_remember_stamp(struct inetreturn 0 ; } -struct inet_connection_sock_af_ops ipv4_specific = { +const struct inet_connection_sock_af_ops ipv4_specific = { .queue_xmit = ip_queue_xmit, .send_check = tcp_v4_send_check, .rebuild_header = inet_sk_rebuild_header,
net/ipv6/tcp_ipv6.c +4 -4
@@ -75,8 +75,8 @@ static void tcp_v6_reqsk_send_ack(structstatic int tcp_v6_do_rcv (struct sock *sk,struct sk_buff *skb); -static struct inet_connection_sock_af_ops ipv6_mapped; -static struct inet_connection_sock_af_ops ipv6_specific; +static const struct inet_connection_sock_af_ops ipv6_mapped; +static const struct inet_connection_sock_af_ops ipv6_specific;#ifdef CONFIG_TCP_MD5SIG static const struct tcp_sock_af_ops tcp_sock_ipv6_specific;static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific;
@@ -1760,7 +1760,7 @@ static int tcp_v6_remember_stamp(structreturn 0 ; } -static struct inet_connection_sock_af_ops ipv6_specific = { +static const struct inet_connection_sock_af_ops ipv6_specific = { .queue_xmit = inet6_csk_xmit, .send_check = tcp_v6_send_check, .rebuild_header = inet6_sk_rebuild_header,
@@ -1792,7 +1792,7 @@ static const struct tcp_sock_af_ops tcp_* TCP over IPv4 via INET6 API */ -static struct inet_connection_sock_af_ops ipv6_mapped = { +static const struct inet_connection_sock_af_ops ipv6_mapped = { .queue_xmit = ip_queue_xmit, .send_check = tcp_v4_send_check, .rebuild_header = inet_sk_rebuild_header,
include/net/transp_v6.h +1 -1
@@ -51,7 +51,7 @@ extern int datagram_send_ctl(struct ne/* * address family specific functions */ -extern struct inet_connection_sock_af_ops ipv4_specific; +extern const struct inet_connection_sock_af_ops ipv4_specific;extern void inet6_destroy_sock (struct sock *sk);
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 01 Sep 2009 22:25:00 -0700
Quoted 2 lines
Many places were not using const when defining/using structures that only contain initialized values.
All applied to net-next-2.6
Nice work Stephen.