diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2011-04-15 02:46:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-08 15:49:33 -0400 |
commit | 1ab7b6ac2709d0eb05a7144cd0e14faa3a7ea162 (patch) | |
tree | f3ac5ea7a7e2d9f1c1fa3be7284329ec42d96191 /include | |
parent | 534eacb5d4e7bafbdb60386678afeffb7966c375 (diff) |
ethtool: remove phys_id from ethtool_ops
After that all the upstream kernel drivers now use phys_id,
and the old ethtool_ops interface (phys_id) can be removed.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ethtool.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 4194a2067a14..d659fdc77eb3 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -814,12 +814,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported); | |||
814 | * the indicator accordingly. Finally, it is called with the argument | 814 | * the indicator accordingly. Finally, it is called with the argument |
815 | * %ETHTOOL_ID_INACTIVE and must deactivate the indicator. Returns a | 815 | * %ETHTOOL_ID_INACTIVE and must deactivate the indicator. Returns a |
816 | * negative error code or zero. | 816 | * negative error code or zero. |
817 | * @phys_id: Deprecated in favour of @set_phys_id. | ||
818 | * Identify the physical device, e.g. by flashing an LED | ||
819 | * attached to it until interrupted by a signal or the given time | ||
820 | * (in seconds) elapses. If the given time is zero, use a default | ||
821 | * time limit. Returns a negative error code or zero. Being | ||
822 | * interrupted by a signal is not an error. | ||
823 | * @get_ethtool_stats: Return extended statistics about the device. | 817 | * @get_ethtool_stats: Return extended statistics about the device. |
824 | * This is only useful if the device maintains statistics not | 818 | * This is only useful if the device maintains statistics not |
825 | * included in &struct rtnl_link_stats64. | 819 | * included in &struct rtnl_link_stats64. |
@@ -908,7 +902,6 @@ struct ethtool_ops { | |||
908 | void (*self_test)(struct net_device *, struct ethtool_test *, u64 *); | 902 | void (*self_test)(struct net_device *, struct ethtool_test *, u64 *); |
909 | void (*get_strings)(struct net_device *, u32 stringset, u8 *); | 903 | void (*get_strings)(struct net_device *, u32 stringset, u8 *); |
910 | int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state); | 904 | int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state); |
911 | int (*phys_id)(struct net_device *, u32); | ||
912 | void (*get_ethtool_stats)(struct net_device *, | 905 | void (*get_ethtool_stats)(struct net_device *, |
913 | struct ethtool_stats *, u64 *); | 906 | struct ethtool_stats *, u64 *); |
914 | int (*begin)(struct net_device *); | 907 | int (*begin)(struct net_device *); |