Commit 313674af authored by Matthew Wilcox's avatar Matthew Wilcox Committed by David S. Miller
Browse files

[NET]: ethtool_perm_addr only has one implementation 



All drivers implement ethtool get_perm_addr the same way -- by calling
the generic function.  So we can inline the generic function into the
caller and avoid going through the drivers.

Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61a44b9c

drivers/net/3c59x.c

+0 −1
Original line number Diff line number Diff line
@@ -2886,7 +2886,6 @@ static const struct ethtool_ops vortex_ethtool_ops = { 
	.set_settings           = vortex_set_settings,

	.get_link               = ethtool_op_get_link,

	.nway_reset             = vortex_nway_reset,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



#ifdef CONFIG_PCI

drivers/net/8139cp.c

+0 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,6 @@ static const struct ethtool_ops cp_ethtool_ops = { 
	.set_wol		= cp_set_wol,

	.get_strings		= cp_get_strings,

	.get_ethtool_stats	= cp_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

	.get_eeprom_len		= cp_get_eeprom_len,

	.get_eeprom		= cp_get_eeprom,

	.set_eeprom		= cp_set_eeprom,

drivers/net/8139too.c

+0 −1
Original line number Diff line number Diff line
@@ -2452,7 +2452,6 @@ static const struct ethtool_ops rtl8139_ethtool_ops = { 
	.get_strings		= rtl8139_get_strings,

	.get_stats_count	= rtl8139_get_stats_count,

	.get_ethtool_stats	= rtl8139_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

drivers/net/ax88796.c

+0 −1
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ static const struct ethtool_ops ax_ethtool_ops = { 
	.set_settings		= ax_set_settings,

	.nway_reset		= ax_nway_reset,

	.get_link		= ax_get_link,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



/* setup code */

drivers/net/b44.c

+0 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,6 @@ static const struct ethtool_ops b44_ethtool_ops = { 
	.get_strings		= b44_get_strings,

	.get_stats_count	= b44_get_stats_count,

	.get_ethtool_stats	= b44_get_ethtool_stats,

	.get_perm_addr		= ethtool_op_get_perm_addr,

};



static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)