Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] idpf: fix building without IPv4 | Date | Mon, 25 Sep 2023 17:58:44 +0200 |
| |
From: Arnd Bergmann <arnd@arndb.de>
The newly added offload code fails to link when IPv4 networking is disabled:
arm-linux-gnueabi-ld: drivers/net/ethernet/intel/idpf/idpf_txrx.o: in function `idpf_vport_splitq_napi_poll': idpf_txrx.c:(.text+0x7a20): undefined reference to `tcp_gro_complete'
Add complile-time checks for both CONFIG_INET (ipv4) and CONFIG_IPV6 in order to drop the corresponding code when the features are unavailable. This should also help produce slightly better output for IPv4-only kernel builds, if anyone still uses those.
Fixes: 3a8845af66edb ("idpf: add RX splitq napi poll support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index 6fa79898c42c5..140c1ad3e0679 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -2770,8 +2770,10 @@ static void idpf_rx_csum(struct idpf_queue *rxq, struct sk_buff *skb, if (!(csum_bits->l3l4p)) return; - ipv4 = IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV4); - ipv6 = IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV6); + ipv4 = IS_ENABLED(CONFIG_INET) && + IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV4); + ipv6 = IS_ENABLED(CONFIG_IPV6) && + IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV6); if (ipv4 && (csum_bits->ipe || csum_bits->eipe)) goto checksum_fail; @@ -2870,8 +2872,10 @@ static int idpf_rx_rsc(struct idpf_queue *rxq, struct sk_buff *skb, if (unlikely(!rsc_seg_len)) return -EINVAL; - ipv4 = IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV4); - ipv6 = IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV6); + ipv4 = IS_ENABLED(CONFIG_INET) && + IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV4); + ipv6 = IS_ENABLED(CONFIG_IPV6) && + IDPF_RX_PTYPE_TO_IPV(decoded, IDPF_RX_PTYPE_OUTER_IPV6); if (unlikely(!(ipv4 ^ ipv6))) return -EINVAL; -- 2.39.2
| |