From nobody Sat Apr 27 14:47:41 2024 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 4VRXWK5HqWz5JGSN; Sat, 27 Apr 2024 14:47:41 +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 4VRXWK4gnCz41xg; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; 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=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=TnkxiLVYZCW/wjP7yKlllviO5NUpYtuoLn/3HCvC19Q8Uxq/mQORtWpRcL84nHMfqZCkNX LLq1yzrtggqrREwUZ7a5otrRDEG0w9cJoXDf4cQNx6WERFeOWCRuXO/Hc5FfhLIxgU7y/h C5MuqupddrEsxRR1XxNX/CoMLb8XZ4/1GUXFKxYM82mNObHHmNKd7v1WEt2uCe2CUNLZqK sboSM8RRw/CI45bxjIyqRtLnHcHfcKM2zclKeij2DHaWHoza9FVgn+iFnUKA74eEPwzb6g PlxvQCeE06oH+DXA0YwXip0h5TXPy52K5hYSTOAhKR4bOKf6ezohq1yNk1T1xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229261; a=rsa-sha256; cv=none; b=YE4VT0sX01uaCcUCBLWX6T+0srtMN9d+LtK2OerjO7NrWwVLO2pasTRhFd0aKLEwCpVCrb ngFNHXJaDULygw/5YcVw/BuzQnjfLgBl8ziGHnOK4R3yWCQeCMNeevSJ6AQen2ImuAOq2L cFawGlidcA+x9f7vkO9KR3uHUtbNSYeKvT5R/Neot8ALlO6gfhyTuEEM0i39hV2a4hhpDs L5krPo9b1o8HnkAbh6h4Ob5jn74Ldh9qr44LobDoGAYnRXgpPMOQTiXHdXkBK8nX2LwlBQ Ap0AvI4n2TXWY08PxUK4cEvlygRKnBoW3oSrGP6Uqr2i3wN8k6rb+kAdwAqQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; 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=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=F2tMT2HUbcYj37n7J8R2IHA0GEDXwZ5z6y2Cy3oVhzvdIBJlV+h6IVMV2QpfkhEkfzdpjP UOcNJP4Pke1YJbP6NKCChm1FSGpA/UYhWbxamlLCtysqOlWQ2ImOFjAXfrTnEpmVo9QBpB d44YetSIXvyGqU8KpvwPT4my0HqMj41AsmvYk/zn+mZARdOoHD/GdH22frhemMI+w32kTe 5eMOQqmB9ita9Drqg9zvXjMCSlmqmga6NBisHI/ac5owL9CPjAD8pdLnHLMA1J80Y56ZIr MerWR+uP24Hl+PNMprfzYbVwDdJ9fpxJiiifBmUOlTRtbqYogpcR42crT1/KXA== 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 4VRXWK4HDPzWcR; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43RElfUp015568; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RElfG9015565; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:47:41 GMT Message-Id: <202404271447.43RElfG9015565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 90499f6efd57 - stable/13 - Support ARP for 802 networks 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 90499f6efd57754563223bce1ec173669f1ce8a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90499f6efd57754563223bce1ec173669f1ce8a1 commit 90499f6efd57754563223bce1ec173669f1ce8a1 Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-27 14:47:16 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 (cherry picked from commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b) (cherry picked from commit d776dd5fbd484acdf00f6df55583e9aa53226859) --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0319807dbfd2..f201fd67cab4 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -47,7 +47,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index cd5055e31533..9c72f9268ae5 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -684,6 +684,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband";