Commit 20023d3e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

r8169: improve rtl_coalesce_info

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b994b4a
...@@ -643,9 +643,7 @@ struct rtl8169_private { ...@@ -643,9 +643,7 @@ struct rtl8169_private {
void *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */ void *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */
struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */ struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */
u16 cp_cmd; u16 cp_cmd;
u16 irq_mask; u16 irq_mask;
const struct rtl_coalesce_info *coalesce_info;
struct clk *clk; struct clk *clk;
struct { struct {
...@@ -1785,19 +1783,17 @@ static const struct rtl_coalesce_info rtl_coalesce_info_8168_8136[] = { ...@@ -1785,19 +1783,17 @@ static const struct rtl_coalesce_info rtl_coalesce_info_8168_8136[] = {
static const struct rtl_coalesce_info *rtl_coalesce_info(struct net_device *dev) static const struct rtl_coalesce_info *rtl_coalesce_info(struct net_device *dev)
{ {
struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_private *tp = netdev_priv(dev);
struct ethtool_link_ksettings ecmd;
const struct rtl_coalesce_info *ci; const struct rtl_coalesce_info *ci;
int rc;
rc = phy_ethtool_get_link_ksettings(dev, &ecmd); if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
if (rc < 0) ci = rtl_coalesce_info_8169;
return ERR_PTR(rc); else
ci = rtl_coalesce_info_8168_8136;
for (ci = tp->coalesce_info; ci->speed != 0; ci++) { for (; ci->speed; ci++) {
if (ecmd.base.speed == ci->speed) { if (tp->phydev->speed == ci->speed)
return ci; return ci;
} }
}
return ERR_PTR(-ELNRNG); return ERR_PTR(-ELNRNG);
} }
...@@ -6829,11 +6825,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6829,11 +6825,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
rtl_set_irq_mask(tp); 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->fw_name = rtl_chip_infos[chipset].fw_name;
tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters), tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment