| Message ID | 9bd31c9a29bcf406ab90a249a28fc328e5578fd1.1675875404.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9b0651e429a04b58c29f2133da4ccc70f81263b8 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] sfc: move xdp_features configuration in efx_pci_probe_post_io() | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <martin.lau@kernel.org>: On Wed, 8 Feb 2023 17:58:40 +0100 you wrote: > 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: Lorenzo Bianconi <lorenzo@kernel.org> > --- > drivers/net/ethernet/sfc/efx.c | 8 ++++---- > drivers/net/ethernet/sfc/siena/efx.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) Here is the summary with links: - [bpf-next] sfc: move xdp_features configuration in efx_pci_probe_post_io() https://git.kernel.org/bpf/bpf-next/c/9b0651e429a0 You are awesome, thank you!
Many thanks Lorenzo. It got applied in record time! Martin On Wed, Feb 08, 2023 at 05:58:40PM +0100, Lorenzo Bianconi wrote: > 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: Lorenzo Bianconi <lorenzo@kernel.org> > --- > drivers/net/ethernet/sfc/efx.c | 8 ++++---- > drivers/net/ethernet/sfc/siena/efx.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > index 18ff8d8cff42..9569c3356b4a 100644 > --- a/drivers/net/ethernet/sfc/efx.c > +++ b/drivers/net/ethernet/sfc/efx.c > @@ -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); > > diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c > index a6ef21845224..ef52ec71d197 100644 > --- a/drivers/net/ethernet/sfc/siena/efx.c > +++ b/drivers/net/ethernet/sfc/siena/efx.c > @@ -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); > > -- > 2.39.1
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 18ff8d8cff42..9569c3356b4a 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -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); diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c index a6ef21845224..ef52ec71d197 100644 --- a/drivers/net/ethernet/sfc/siena/efx.c +++ b/drivers/net/ethernet/sfc/siena/efx.c @@ -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);
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: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/ethernet/sfc/efx.c | 8 ++++---- drivers/net/ethernet/sfc/siena/efx.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)