|
@@ -2087,21 +2087,19 @@ static int fec_enet_init(struct net_device *ndev)
|
|
|
writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK);
|
|
|
netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, NAPI_POLL_WEIGHT);
|
|
|
|
|
|
- if (id_entry->driver_data & FEC_QUIRK_HAS_VLAN) {
|
|
|
+ if (id_entry->driver_data & FEC_QUIRK_HAS_VLAN)
|
|
|
/* enable hw VLAN support */
|
|
|
ndev->features |= NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
- ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
- }
|
|
|
|
|
|
if (id_entry->driver_data & FEC_QUIRK_HAS_CSUM) {
|
|
|
/* enable hw accelerator */
|
|
|
ndev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
|
|
|
| NETIF_F_RXCSUM);
|
|
|
- ndev->hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
|
|
|
- | NETIF_F_RXCSUM);
|
|
|
fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
|
|
|
}
|
|
|
|
|
|
+ ndev->hw_features = ndev->features;
|
|
|
+
|
|
|
fec_restart(ndev, 0);
|
|
|
|
|
|
return 0;
|