From nobody Thu Mar 10 13:32:52 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 6C6881A1400C; Thu, 10 Mar 2022 13:32:53 +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 4KDqkY0DNVz3Cy9; Thu, 10 Mar 2022 13:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646919173; 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=PGa7BI+dvA2RaBfAisOvfctGt+DkyKsC56TCwqPHnLo=; b=L+939Jffo59dqInhcEeI6IQOBwSxhswY82G67iIPxcPVkAgYcsmGFktDlK/uT1n8xEw8eO rIRK9jflzlpdl/vCbC8+iy6IodizeG/wG0fDxcEGy491GUwego9K3fOapoRx5JSBPVKZ+B gR5OAvFRuR9UDNMggNjXvXFm2Oii6Inlyeu3IRWMjlaDyODXMjSX98OAGm6OQjCkfr6KMU H/+rJPGjOi3wRSv1ZP9D6V4u2Uxs40ugyZgn2QFUApFRtWmcEIXFHTJyjQDCadX5X8yWKT xXg77UqgSUUUu+8UmunEp4QoDxH8QsOnI44EZ8kNs3WOI/CoqlW428iOlOSENg== 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 ABBE225BCB; Thu, 10 Mar 2022 13:32:52 +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 22ADWqOA006682; Thu, 10 Mar 2022 13:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ADWqo0006681; Thu, 10 Mar 2022 13:32:52 GMT (envelope-from git) Date: Thu, 10 Mar 2022 13:32:52 GMT Message-Id: <202203101332.22ADWqo0006681@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: 20ea94a9ec0b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 20ea94a9ec0b99f97f7c0adf0e5168c97e8025d1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646919173; 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=PGa7BI+dvA2RaBfAisOvfctGt+DkyKsC56TCwqPHnLo=; b=t4AC9NoW9fbIHigBS3JIUmYOkqPkv/ETW0Gm/ZeLn4k+PfVuGhxDm/XrD7DvpBWCCQk6q+ /PP7OUHr6GJcx9Q6LRJxyvJwD5lZNGdizie9LgqXAa7kG222crsx1VbMGBOtpETM5gpWBM rArHjMPAKR84iJyswfWzHTihY8ZhOeWbWuBtHxr/Vuvuw3L/f/h+O4pYa91EVQYGZQl9Ag qwGHxH4zXOASIMIHbjhEMCrqFUKQjJK87yhm+AY4ea0fllGwJytn9bwfNLS7uV9XAoBi5I x/2UOVrxrzo1LYDadq3zYqL/nfpYObGBXEZ9Y+u8maD9+GTNXE0tcz/zF0pxpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646919173; a=rsa-sha256; cv=none; b=VmZIflujBHIt7zHPAjO8hJiLsuWLbtaF7yEk1KLDQoB4SNiwNqlQvEXdIVym1Dqo5QiE4Z 8Bir6CW8iGnh7ek5NzdIkhSlaOctxfUIJj2AsPpazca44vbjOUtDG+2aPduHKVasVB221J LtC+wOHLOVbp7bcg9KqzcwJH6qO2lAf2OTdtlVf73rwLr30X9UcV5jR5wKBVzli3QzHstm HbVx5VI4fkgP/ObqRzcRXAyMz6y8jvONfHhdk5JdrJW49M6xodTwa9dZm7aSF7MIj/Wm/V TrhyJOyehw1YTrZR5Dnj7185JdUJt8bm0udsNXKpifkR3PlqQ77M90ogS73Tfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=20ea94a9ec0b99f97f7c0adf0e5168c97e8025d1 commit 20ea94a9ec0b99f97f7c0adf0e5168c97e8025d1 Author: Santiago Martinez AuthorDate: 2022-03-03 09:44:43 +0000 Commit: Kristof Provost CommitDate: 2022-03-10 08:51:41 +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 818f25f0cdb5..6a77f44ffe87 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;