From nobody Thu Mar 10 13:32:51 2022 X-Original-To: dev-commits-src-all@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 BC7931A14002; Thu, 10 Mar 2022 13:32:51 +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 4KDqkW4dbsz3Cy1; Thu, 10 Mar 2022 13:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646919171; 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=ViYKAsDwCmkcduh65Lbo+4Ylk2SdYexlLYccixJf1gA=; b=yrZqhKde3hNW9I82DlTqU5SBPIFkYqt06385GR4WLltXNa/MjpNtFHVXNZ/b9qxIZr972c 5HW3Gw9IN8ZoLSh9hvb74jqLSVnTyDLcS1wo5jLs+9DaOobRM5PfzeI93iePnVvo6VDY1B J07uG5D/nNpuqqQa90OHsxS/G+XFBlGSzUEpC6f/ZbGSCycd0iuHlsa6g136TW7Qf0Xk2+ QuO1TFvZvZbY5ynwB7sQ0oPphOPLQUk4XYdQm0yEuT0fj6NuUiGcsrkQ3+QYK43Z9cQMs9 9Oa6Mfkf5lJtv+zym4ZIen5r7h1KzS6WM5+O+ziP0iCAC4rReVe+eBShXZUh/Q== 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 729EB25BCA; Thu, 10 Mar 2022 13:32:51 +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 22ADWpTl006575; Thu, 10 Mar 2022 13:32:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ADWpoq006574; Thu, 10 Mar 2022 13:32:51 GMT (envelope-from git) Date: Thu, 10 Mar 2022 13:32:51 GMT Message-Id: <202203101332.22ADWpoq006574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ca7af63e88f8 - stable/12 - if_epair: fix build with RSS and INET or INET6 disabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/12 X-Git-Reftype: branch X-Git-Commit: ca7af63e88f8cc96865d45e020a57b3062631388 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646919171; 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=ViYKAsDwCmkcduh65Lbo+4Ylk2SdYexlLYccixJf1gA=; b=aNnJgoznIImb+OZ1Gzlbn0HOo+UmT7bNSklvsPJ+Ne17CyrlT4GMcOA1RSuALnU5NPYOgq ZT1xS00z7Y9D/EDKb40dGHES7SAZt9/6WE9+cp1aL+e6Ys0V6tqZI3Pmz14zPLwCCKkjoS OAP1kz3SRgjWlT0zorxGrsXRbK9NNiCzT2sX4Mrf1z4OXOhDGUfnt3TZlGiMqJUnQ7gfrv qhCbDR1TN5ZMMP8nrQZzly8JSv6M69v964ddAItnnH1mcFP2RCgadXdNzaPQwEndOr365x 0edM14a9YQhaZJ1tmFhN79r+KlekKZcOTNda7AFLBgRuYBM/kjkvgaNikdudkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646919171; a=rsa-sha256; cv=none; b=U6o5DcgpjUDq2HBWP+N3r41dlUwmNVtCygz/Z8x2LUmM7pORC0EEIAfw/jDQYYwIYK5faE UWThydNBH4nGsGZ0tdaCrEIAtTpCTpq/+/t5nBn9mg/hYMMZJZ+lTPTUMOwwJDSXg0WnqV ItTPWI7Thaoa6IK1/7ekKfmoG+6YtjAbf2eyF4DK5eRyyI1/OnAPfqAT6Wb9D7qFpQ0lfJ lVGloHD88OihBzDmiwUc7uJgI5ACXqyXxOCRjXAaUiW+4Q5OwpHHJUmRkVQbHlD989WC2z B23s/o7GsnqNrjSeuVMhSb64MRgbiSceVUBYZyNLYRE3E1zTIy0USlOASKRIiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7af63e88f8cc96865d45e020a57b3062631388 commit ca7af63e88f8cc96865d45e020a57b3062631388 Author: Santiago Martinez AuthorDate: 2022-03-03 09:44:43 +0000 Commit: Kristof Provost CommitDate: 2022-03-10 08:51:54 +0000 if_epair: fix build with RSS and INET or INET6 disabled Reviewed by: kp MFC after: 1 week (cherry picked from commit 52bcdc5b809ea56cbdce0bd36499e4ae74780d2b) --- 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 87d8fd969db8..b95418e29071 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include "opt_rss.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include #include @@ -74,9 +76,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 *); @@ -213,12 +219,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;