diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-18 13:51:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-18 13:51:43 +0100 |
| commit | ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480 (patch) | |
| tree | 15fe5f3dc395c3b1e713ad52bcd529b1a343cfe2 /drivers/net/ethernet/intel/igc/igc_main.c | |
| parent | 72bf80cf09c4693780ad93a31b48fa5a4e17a946 (diff) | |
| parent | 519d81956ee277b4419c723adfb154603c2565ba (diff) | |
| download | linux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.tar.gz linux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.tar.bz2 linux-stable-ed96f35cecb0a7d1d95bbba8b9f212e60d0f7480.zip | |
Merge tag 'v5.15-rc6' into regulator-5.16
Linux 5.15-rc6
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index b877efae61df..0e19b4d02e62 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6350,7 +6350,9 @@ static int igc_probe(struct pci_dev *pdev, if (pci_using_dac) netdev->features |= NETIF_F_HIGHDMA; - netdev->vlan_features |= netdev->features; + netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID; + netdev->mpls_features |= NETIF_F_HW_CSUM; + netdev->hw_enc_features |= netdev->vlan_features; /* MTU range: 68 - 9216 */ netdev->min_mtu = ETH_MIN_MTU; |