lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ethtool: allow const ethtool_ops

Browse Source 
The ethtool_ops structure is immutable, it expected to be setup
by the driver and is never changed. This patch allows drivers to
declare there ethtool_ops structure read-only.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger
2006-09-08 11:16:13 -07:00
committed by Jeff Garzik
parent f65b138ca9
commit 76fd859370
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netdevice.h
View File

@@ -342,7 +342,7 @@ struct net_device
/* Instance data managed by the core of Wireless Extensions. */ /* Instance data managed by the core of Wireless Extensions. */
struct iw_public_data * wireless_data; struct iw_public_data * wireless_data;
struct ethtool_ops *ethtool_ops; const struct ethtool_ops *ethtool_ops;
/* /*
* This marks the end of the "visible" part of the structure. All * This marks the end of the "visible" part of the structure. All

14
net/core/ethtool.c
View File

@@ -143,7 +143,7 @@ static int ethtool_set_settings(struct net_device *dev, void __user *useraddr)
static int ethtool_get_drvinfo(struct net_device *dev, void __user *useraddr) static int ethtool_get_drvinfo(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_drvinfo info; struct ethtool_drvinfo info;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
if (!ops->get_drvinfo) if (!ops->get_drvinfo)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -169,7 +169,7 @@ static int ethtool_get_drvinfo(struct net_device *dev, void __user *useraddr)
static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
{ {
struct ethtool_regs regs; struct ethtool_regs regs;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
void *regbuf; void *regbuf;
int reglen, ret; int reglen, ret;
@@ -282,7 +282,7 @@ static int ethtool_get_link(struct net_device *dev, void __user *useraddr)
static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr) static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_eeprom eeprom; struct ethtool_eeprom eeprom;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data; u8 *data;
int ret; int ret;
@@ -327,7 +327,7 @@ static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr)
static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr) static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_eeprom eeprom; struct ethtool_eeprom eeprom;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data; u8 *data;
int ret; int ret;
@@ -640,7 +640,7 @@ static int ethtool_set_gso(struct net_device *dev, char __user *useraddr)
static int ethtool_self_test(struct net_device *dev, char __user *useraddr) static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
{ {
struct ethtool_test test; struct ethtool_test test;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
u64 *data; u64 *data;
int ret; int ret;
@@ -673,7 +673,7 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_gstrings gstrings; struct ethtool_gstrings gstrings;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data; u8 *data;
int ret; int ret;
@@ -733,7 +733,7 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
static int ethtool_get_stats(struct net_device *dev, void __user *useraddr) static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_stats stats; struct ethtool_stats stats;
struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
u64 *data; u64 *data;
int ret; int ret;