r8169: simplify setting netdev features

Setting dev->features a few lines later allows to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index a9a55589ebd59e52d4c1a9640f35a5f484f56734..bc92e8c55fa9e772a8c0b630c2654389792f9e98 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5544,9 +5544,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT);
 
-       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-               NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX |
-               NETIF_F_HW_VLAN_CTAG_RX;
        dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX |
                NETIF_F_HW_VLAN_CTAG_RX;
@@ -5568,7 +5565,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        if (rtl_chip_supports_csum_v2(tp)) {
                dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
-               dev->features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
                dev->gso_max_size = RTL_GSO_MAX_SIZE_V2;
                dev->gso_max_segs = RTL_GSO_MAX_SEGS_V2;
        } else {
@@ -5583,9 +5579,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
            tp->mac_version == RTL_GIGA_MAC_VER_22) {
                dev->vlan_features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
                dev->hw_features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
-               dev->features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
        }
 
+       dev->features |= dev->hw_features;
+
        dev->hw_features |= NETIF_F_RXALL;
        dev->hw_features |= NETIF_F_RXFCS;