From nobody Thu Mar 03 17:31:46 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2223B19E6453; Thu, 3 Mar 2022 17:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8dMR2VhPz4c1l; Thu, 3 Mar 2022 17:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646328707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0BQqd8X20UQ6D9LZj5xM4T9FaX+/v94GeCrLt910IZQ=; b=s5XvRBt5N506in3nCkqogFDEuv91negM0mH32cJC63bv2b/X6O0I9hp/V+/s009avgnKxq SEJXVC3ERZa93GdVU8433xi/wmUPoOuLSgdu2f0dSGZEk42f+HHtxqhakLd1X8sMGEABHa LJw07fF0RQWzEXXlDRSMPBdziPlioV0Gf0KxZg2JMrkQIwRhQTKvP+CBeQVSP29peU7XqQ JgaxdXdDo/JnEmQpx7/zcXgUfH8Zso9ZbzX4Ikyzeg4ePxV1bzp3KeIFDRJI27eNJNEKRP Ir4v7E6CfEAKwZuO1BGnEmjDLaXMKBJoNChShhpC93ZwvYT6gBSWz4u/wZMsow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AAC71C219; Thu, 3 Mar 2022 17:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 223HVksX055833; Thu, 3 Mar 2022 17:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223HVkIv055832; Thu, 3 Mar 2022 17:31:46 GMT (envelope-from git) Date: Thu, 3 Mar 2022 17:31:46 GMT Message-Id: <202203031731.223HVkIv055832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 52bcdc5b809e - main - if_epair: fix build with RSS and INET or INET6 disabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52bcdc5b809ea56cbdce0bd36499e4ae74780d2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646328707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0BQqd8X20UQ6D9LZj5xM4T9FaX+/v94GeCrLt910IZQ=; b=T6hjA3Wu7RJNa6JBd8v2sNb3gnES8UQvMiVK2vS5MTGDOGVZEzoz8qK2eoaf00NpXU0Qf7 fl8Wh6UX7AbkT07fbHMKJhItlcDWiMp+gYCBz4KXbNMy/UBcr3T2riVvaYGRxOoGmFuE8x XqB+1AbnRHfs7hVziXrzu+nrIqWCGU4kfHW5eL92MQ/iHfOzGTTZHZoGEdkQok43awDCgl JJxe0tPENeI+ZvB6FhJrrZhsXS8ssR9/eCZbJTlGk2/rtaJ8gEcN5JQui4kIZL7/jmeNtT eAC8IJIt541rC6oBliQudMDtzCUnKFXX6djubCitdBhGhT5jmw8VT2RyHbzRPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646328707; a=rsa-sha256; cv=none; b=Xg2vCil3yndvVcDsbcoONE2Spdi/zbJZFV4QfzxjtxadDy83qOUxAjl3ykZqH8IZtVbUKh y3e3vlzG7tLxhUyOBJx8rCWrCf3MCQmGmTYYjUG922vqHvaVRhwGxbeQtNWPOksbj4wk6q dAxag6Qig7w2nBbtAmIgUjyGZqAowg6lcftUvV2A3ECWVudHeGN5BZEW5fXTYjLrq38hsw 8zv+2DLUP3GnPZvIXL+6tg9OP+cUKS04Y7F0Z1X+AAdMuwWVTQDM+yNZoI73pITeLhJu7w EOKARwb5t0YwQWVE5vA8Kg11lDiNx5dbZh53uzU66VCVPpfMFm+0+aMBBmcXag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=52bcdc5b809ea56cbdce0bd36499e4ae74780d2b commit 52bcdc5b809ea56cbdce0bd36499e4ae74780d2b Author: Santiago Martinez AuthorDate: 2022-03-03 09:44:43 +0000 Commit: Kristof Provost CommitDate: 2022-03-03 17:31:26 +0000 if_epair: fix build with RSS and INET or INET6 disabled Reviewed by: kp MFC after: 1 week --- sys/modules/if_epair/Makefile | 2 +- sys/net/if_epair.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/modules/if_epair/Makefile b/sys/modules/if_epair/Makefile index 3e102413bfe2..8b063623f2e8 100644 --- a/sys/modules/if_epair/Makefile +++ b/sys/modules/if_epair/Makefile @@ -3,6 +3,6 @@ .PATH: ${SRCTOP}/sys/net KMOD= if_epair -SRCS= bus_if.h device_if.h if_epair.c +SRCS= bus_if.h device_if.h if_epair.c opt_rss.h opt_inet.h opt_inet6.h .include diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 629de981d5b0..c39434b31b9f 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include "opt_rss.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include #include @@ -73,9 +75,13 @@ __FBSDID("$FreeBSD$"); #include #ifdef RSS #include +#ifdef INET #include +#endif +#ifdef INET6 #include #endif +#endif #include static int epair_clone_match(struct if_clone *, const char *); @@ -217,12 +223,16 @@ epair_menq(struct mbuf *m, struct epair_softc *osc) eh = mtod(m, struct ether_header *); switch (ntohs(eh->ether_type)) { +#ifdef INET case ETHERTYPE_IP: rss_soft_m2cpuid_v4(m, 0, &bucket); break; +#endif +#ifdef INET6 case ETHERTYPE_IPV6: rss_soft_m2cpuid_v6(m, 0, &bucket); break; +#endif default: bucket = 0; break;