Commit 9b0651e4 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Martin KaFai Lau
Browse files

sfc: move xdp_features configuration in efx_pci_probe_post_io() 



Move xdp_features configuration from efx_pci_probe() to
efx_pci_probe_post_io() since it is where all the other basic netdev
features are initialised.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/9bd31c9a29bcf406ab90a249a28fc328e5578fd1.1675875404.git.lorenzo@kernel.org


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent d00d5b82

drivers/net/ethernet/sfc/efx.c

+4 −4
Original line number Diff line number Diff line
@@ -1025,6 +1025,10 @@ static int efx_pci_probe_post_io(struct efx_nic *efx) 
	net_dev->features &= ~NETIF_F_HW_VLAN_CTAG_FILTER;

	net_dev->features |= efx->fixed_features;



	net_dev->xdp_features = NETDEV_XDP_ACT_BASIC |

				NETDEV_XDP_ACT_REDIRECT |

				NETDEV_XDP_ACT_NDO_XMIT;



	rc = efx_register_netdev(efx);

	if (!rc)

		return 0;
@@ -1078,10 +1082,6 @@ static int efx_pci_probe(struct pci_dev *pci_dev, 


	pci_info(pci_dev, "Solarflare NIC detected\n");



	efx->net_dev->xdp_features = NETDEV_XDP_ACT_BASIC |

				     NETDEV_XDP_ACT_REDIRECT |

				     NETDEV_XDP_ACT_NDO_XMIT;



	if (!efx->type->is_vf)

		efx_probe_vpd_strings(efx);

drivers/net/ethernet/sfc/siena/efx.c

+4 −4
Original line number Diff line number Diff line
@@ -1007,6 +1007,10 @@ static int efx_pci_probe_post_io(struct efx_nic *efx) 
	net_dev->features &= ~NETIF_F_HW_VLAN_CTAG_FILTER;

	net_dev->features |= efx->fixed_features;



	net_dev->xdp_features = NETDEV_XDP_ACT_BASIC |

				NETDEV_XDP_ACT_REDIRECT |

				NETDEV_XDP_ACT_NDO_XMIT;



	rc = efx_register_netdev(efx);

	if (!rc)

		return 0;
@@ -1048,10 +1052,6 @@ static int efx_pci_probe(struct pci_dev *pci_dev, 


	pci_info(pci_dev, "Solarflare NIC detected\n");



	efx->net_dev->xdp_features = NETDEV_XDP_ACT_BASIC |

				     NETDEV_XDP_ACT_REDIRECT |

				     NETDEV_XDP_ACT_NDO_XMIT;



	if (!efx->type->is_vf)

		efx_probe_vpd_strings(efx);