| Message ID | 20220719142424.4528-1-shenjian15@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 09765fcd3c71c47bf160d325bf4cce5c5bb39292 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: amd8111e: remove repeated dev->features assignement | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 19 Jul 2022 22:24:24 +0800 you wrote: > It's repeated with line 1793-1795, and there isn't any other > handling for it. So remove it. > > Signed-off-by: Jian Shen <shenjian15@huawei.com> > --- > drivers/net/ethernet/amd/amd8111e.c | 3 --- > 1 file changed, 3 deletions(-) Here is the summary with links: - [net-next] net: amd8111e: remove repeated dev->features assignement https://git.kernel.org/netdev/net-next/c/09765fcd3c71 You are awesome, thank you!
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 05ac8d9ccb2f..5d1baa01360f 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -1830,9 +1830,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev, dev->max_mtu = AMD8111E_MAX_MTU; netif_napi_add_weight(dev, &lp->napi, amd8111e_rx_poll, 32); -#if AMD8111E_VLAN_TAG_USED - dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; -#endif /* Probe the external PHY */ amd8111e_probe_ext_phy(dev);
It's repeated with line 1793-1795, and there isn't any other handling for it. So remove it. Signed-off-by: Jian Shen <shenjian15@huawei.com> --- drivers/net/ethernet/amd/amd8111e.c | 3 --- 1 file changed, 3 deletions(-)