You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[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: Matthew Wilcox <matthew@wil.cx> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
61a44b9c4b
commit
313674afa8
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -6269,7 +6269,6 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
|
||||
.phys_id = bnx2_phys_id,
|
||||
.get_stats_count = bnx2_get_stats_count,
|
||||
.get_ethtool_stats = bnx2_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
/* Called with rtnl_lock */
|
||||
|
||||
@@ -1583,7 +1583,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
|
||||
.get_wol = get_wol,
|
||||
.get_tso = ethtool_op_get_tso,
|
||||
.set_tso = ethtool_op_set_tso,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr
|
||||
};
|
||||
|
||||
static int in_range(int val, int lo, int hi)
|
||||
|
||||
@@ -2506,7 +2506,6 @@ static const struct ethtool_ops e100_ethtool_ops = {
|
||||
.phys_id = e100_phys_id,
|
||||
.get_stats_count = e100_get_stats_count,
|
||||
.get_ethtool_stats = e100_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||
|
||||
@@ -1973,7 +1973,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
|
||||
.phys_id = e1000_phys_id,
|
||||
.get_stats_count = e1000_get_stats_count,
|
||||
.get_ethtool_stats = e1000_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
void e1000_set_ethtool_ops(struct net_device *netdev)
|
||||
|
||||
@@ -4707,7 +4707,6 @@ static const struct ethtool_ops ops = {
|
||||
.get_regs_len = nv_get_regs_len,
|
||||
.get_regs = nv_get_regs,
|
||||
.nway_reset = nv_nway_reset,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
.get_tso = ethtool_op_get_tso,
|
||||
.set_tso = nv_set_tso,
|
||||
.get_ringparam = nv_get_ringparam,
|
||||
|
||||
@@ -724,7 +724,6 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
|
||||
.phys_id = ixgb_phys_id,
|
||||
.get_stats_count = ixgb_get_stats_count,
|
||||
.get_ethtool_stats = ixgb_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
void ixgb_set_ethtool_ops(struct net_device *netdev)
|
||||
|
||||
@@ -638,7 +638,6 @@ static const struct ethtool_ops ne2k_pci_ethtool_ops = {
|
||||
.get_drvinfo = ne2k_pci_get_drvinfo,
|
||||
.get_tx_csum = ethtool_op_get_tx_csum,
|
||||
.get_sg = ethtool_op_get_sg,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
|
||||
|
||||
@@ -755,5 +755,4 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
|
||||
.get_strings = netxen_nic_get_strings,
|
||||
.get_stats_count = netxen_nic_get_stats_count,
|
||||
.get_ethtool_stats = netxen_nic_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
@@ -1515,7 +1515,6 @@ static const struct ethtool_ops pcnet32_ethtool_ops = {
|
||||
.phys_id = pcnet32_phys_id,
|
||||
.get_regs_len = pcnet32_get_regs_len,
|
||||
.get_regs = pcnet32_get_regs,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
/* only probes for non-PCI devices, the rest are handled by
|
||||
|
||||
@@ -1904,7 +1904,6 @@ static void ql_get_pauseparam(struct net_device *ndev,
|
||||
static const struct ethtool_ops ql3xxx_ethtool_ops = {
|
||||
.get_settings = ql_get_settings,
|
||||
.get_drvinfo = ql_get_drvinfo,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
.get_link = ethtool_op_get_link,
|
||||
.get_msglevel = ql_get_msglevel,
|
||||
.set_msglevel = ql_set_msglevel,
|
||||
|
||||
@@ -1066,7 +1066,6 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
|
||||
.get_strings = rtl8169_get_strings,
|
||||
.get_stats_count = rtl8169_get_stats_count,
|
||||
.get_ethtool_stats = rtl8169_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg,
|
||||
|
||||
@@ -1402,7 +1402,6 @@ static struct ethtool_ops sc92031_ethtool_ops = {
|
||||
.get_strings = sc92031_ethtool_get_strings,
|
||||
.get_stats_count = sc92031_ethtool_get_stats_count,
|
||||
.get_ethtool_stats = sc92031_ethtool_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
.get_ufo = ethtool_op_get_ufo,
|
||||
};
|
||||
|
||||
|
||||
@@ -821,7 +821,6 @@ static const struct ethtool_ops skge_ethtool_ops = {
|
||||
.phys_id = skge_phys_id,
|
||||
.get_stats_count = skge_get_stats_count,
|
||||
.get_ethtool_stats = skge_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -3548,7 +3548,6 @@ static const struct ethtool_ops sky2_ethtool_ops = {
|
||||
.phys_id = sky2_phys_id,
|
||||
.get_stats_count = sky2_get_stats_count,
|
||||
.get_ethtool_stats = sky2_get_ethtool_stats,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SKY2_DEBUG
|
||||
|
||||
@@ -1586,7 +1586,6 @@ static const struct ethtool_ops ethtool_ops = {
|
||||
.get_link = get_link,
|
||||
.get_msglevel = get_msglevel,
|
||||
.set_msglevel = set_msglevel,
|
||||
.get_perm_addr = ethtool_op_get_perm_addr,
|
||||
};
|
||||
|
||||
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user