diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2019-06-10 19:24:25 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-10 20:37:34 +0300 |
| commit | 9fa0a8e1e15aa23da625ff2259afdd512aa048ec (patch) | |
| tree | 2d7042f376bec44aed36d6d1f6f9ef8a30445ebc /drivers/net | |
| parent | 6c19156e29957ae5defbba12fd73b2a11da0854e (diff) | |
| download | linux-9fa0a8e1e15aa23da625ff2259afdd512aa048ec.tar.xz | |
r8169: remove member coalesce_info from struct rtl_cfg_info
To prepare removal of struct rtl_cfg_info, set the coalesce
config based on the chip version number.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 4a53276da5ed..65ae575ba342 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -6461,18 +6461,14 @@ static const struct net_device_ops rtl_netdev_ops = { static const struct rtl_cfg_info { unsigned int has_gmii:1; - const struct rtl_coalesce_info *coalesce_info; } rtl_cfg_infos [] = { [RTL_CFG_0] = { .has_gmii = 1, - .coalesce_info = rtl_coalesce_info_8169, }, [RTL_CFG_1] = { .has_gmii = 1, - .coalesce_info = rtl_coalesce_info_8168_8136, }, [RTL_CFG_2] = { - .coalesce_info = rtl_coalesce_info_8168_8136, } }; @@ -6850,7 +6846,11 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->max_mtu = jumbo_max; rtl_set_irq_mask(tp); - tp->coalesce_info = cfg->coalesce_info; + + 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; |