diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ethtool.h | 3 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 3829712ccc05..8571f18c38a6 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -728,6 +728,9 @@ enum ethtool_sfeatures_retval_bits { | |||
| 728 | /* needed by dev_disable_lro() */ | 728 | /* needed by dev_disable_lro() */ |
| 729 | extern int __ethtool_set_flags(struct net_device *dev, u32 flags); | 729 | extern int __ethtool_set_flags(struct net_device *dev, u32 flags); |
| 730 | 730 | ||
| 731 | extern int __ethtool_get_settings(struct net_device *dev, | ||
| 732 | struct ethtool_cmd *cmd); | ||
| 733 | |||
| 731 | /** | 734 | /** |
| 732 | * enum ethtool_phys_id_state - indicator state for physical identification | 735 | * enum ethtool_phys_id_state - indicator state for physical identification |
| 733 | * @ETHTOOL_ID_INACTIVE: Physical ID indicator should be deactivated | 736 | * @ETHTOOL_ID_INACTIVE: Physical ID indicator should be deactivated |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0a7f619f284e..43b32983ba10 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2589,9 +2589,6 @@ static inline int netif_is_bond_slave(struct net_device *dev) | |||
| 2589 | 2589 | ||
| 2590 | extern struct pernet_operations __net_initdata loopback_net_ops; | 2590 | extern struct pernet_operations __net_initdata loopback_net_ops; |
| 2591 | 2591 | ||
| 2592 | int dev_ethtool_get_settings(struct net_device *dev, | ||
| 2593 | struct ethtool_cmd *cmd); | ||
| 2594 | |||
| 2595 | static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev) | 2592 | static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev) |
| 2596 | { | 2593 | { |
| 2597 | if (dev->features & NETIF_F_RXCSUM) | 2594 | if (dev->features & NETIF_F_RXCSUM) |
