AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 15:16:42 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

r8169: improve rtl_coalesce_info

Browse Source 
tp->coalesce_info is used in rtl_coalesce_info() only, so we can
remove this member. In addition replace phy_ethtool_get_link_ksettings
with a direct access to tp->phydev->speed.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2019-06-11 21:09:19 +02:00 committed by David S. Miller
parent 9b994b4a07
commit 20023d3e50
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -643,9 +643,7 @@ struct rtl8169_private {
void *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */
struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */
u16 cp_cmd;
u16 irq_mask;
const struct rtl_coalesce_info *coalesce_info;
struct clk *clk;
struct {
@ -1785,18 +1783,16 @@ static const struct rtl_coalesce_info rtl_coalesce_info_8168_8136[] = {
static const struct rtl_coalesce_info *rtl_coalesce_info(struct net_device *dev)
{
struct rtl8169_private *tp = netdev_priv(dev);
struct ethtool_link_ksettings ecmd;
const struct rtl_coalesce_info *ci;
int rc;
rc = phy_ethtool_get_link_ksettings(dev, &ecmd);
if (rc < 0)
return ERR_PTR(rc);
if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
ci = rtl_coalesce_info_8169;
else
ci = rtl_coalesce_info_8168_8136;
for (ci = tp->coalesce_info; ci->speed != 0; ci++) {
if (ecmd.base.speed == ci->speed) {
for (; ci->speed; ci++) {
if (tp->phydev->speed == ci->speed)
return ci;
}
}
return ERR_PTR(-ELNRNG);
@ -6829,11 +6825,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
rtl_set_irq_mask(tp);
if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
tp->coalesce_info = rtl_coalesce_info_8169;
else
tp->coalesce_info = rtl_coalesce_info_8168_8136;
tp->fw_name = rtl_chip_infos[chipset].fw_name;
tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters),