Skip to content

Commit

Permalink
[PATCH] ethtool: allow const ethtool_ops
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Sep 13, 2006
1 parent f65b138 commit 76fd859
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion include/linux/netdevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ struct net_device
/* Instance data managed by the core of Wireless Extensions. */
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
Expand Down
14 changes: 7 additions & 7 deletions net/core/ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct ethtool_drvinfo info;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;

if (!ops->get_drvinfo)
return -EOPNOTSUPP;
Expand All @@ -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)
{
struct ethtool_regs regs;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
void *regbuf;
int reglen, ret;

Expand Down Expand Up @@ -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)
{
struct ethtool_eeprom eeprom;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data;
int ret;

Expand Down Expand Up @@ -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)
{
struct ethtool_eeprom eeprom;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data;
int ret;

Expand Down Expand Up @@ -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)
{
struct ethtool_test test;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
u64 *data;
int ret;

Expand Down Expand Up @@ -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)
{
struct ethtool_gstrings gstrings;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data;
int ret;

Expand Down Expand Up @@ -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)
{
struct ethtool_stats stats;
struct ethtool_ops *ops = dev->ethtool_ops;
const struct ethtool_ops *ops = dev->ethtool_ops;
u64 *data;
int ret;

Expand Down

0 comments on commit 76fd859

Please sign in to comment.