From nobody Fri Dec 3 10:07:22 2021 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 B6C25188F01D; Fri, 3 Dec 2021 10:07:22 +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 4J57mB2x2Cz4Zxg; Fri, 3 Dec 2021 10:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 44DD36CCF; Fri, 3 Dec 2021 10:07:22 +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 1B3A7Muf096259; Fri, 3 Dec 2021 10:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3A7Mwu096258; Fri, 3 Dec 2021 10:07:22 GMT (envelope-from git) Date: Fri, 3 Dec 2021 10:07:22 GMT Message-Id: <202112031007.1B3A7Mwu096258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: ea68079ffd84 - main - Suport Q-in-Q for mvneta. 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: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea68079ffd84504848faf5cdf2ebed27d7ba590f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638526042; 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=Q3tN/EYKYzP8cu+PcSHm8LX3IPFKGf6uTqr3FRc7B8g=; b=Gx7tDAyDSd177bbUVY/lqfcdRbLI1RDkCTwuemnnIYE9nD+I1n6k/4YYWyE5NorpLy+TaM 0lCA6ZqvU7ithn/OU31XX0WF0nbqAoHO5+OnzhuZnaVS+MvkW++0AmwD41haTYJkhVpl29 pEaHJNMvWXBaRO/4VoLh4sQf1IoGTi2eT2Ze6bSsVZTsEyz+j/8zxhpmG+oUpHa2vvcMMe Ie1t/12/L0XGv9nOE/G319LYgm6uQXy2skwDCXzHeFPTqQWQFzT1hf6KQlzGiVppevW1kE sAfSjZ1StO47kNj0IeGIlrPKs8aLut6fbFoWIQi1bzfF7p/zrVE8+2xTnQDtMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638526042; a=rsa-sha256; cv=none; b=ei5yrCq4OdCEdw8jTcdhkPVrAV7tVJ6ylswpHXNdvw2C4DWlGn2w8OmR+TTuIvmpeebnyx +YexNstKMy1Nxh2nohBZAKjD7u6iUqyVrpWxPRMFRFIQVNJtHNaR5t92ZevmK1I/8au4b7 nf+T/CklWnFjabFF4ePlj+vZPfH7588G96wq6QfDynY9CaES1qSJCjKoFTVDE6hgOjm3m5 3gn9by4zg0XSQOGvCrwlXR/h4PcYajgl+i4vJYQAcxq/WV16ZYxXcYzABZPD383OwEAy4y GCMRcaMP+P4Weu+8hQA+yK/ycWRRW+uzLWumzneB1wc6Hn9doduR3/j05opHXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=ea68079ffd84504848faf5cdf2ebed27d7ba590f commit ea68079ffd84504848faf5cdf2ebed27d7ba590f Author: Arnaud Ysmal AuthorDate: 2021-10-19 08:07:47 +0000 Commit: Wojciech Macek CommitDate: 2021-12-03 10:06:58 +0000 Suport Q-in-Q for mvneta. --- sys/dev/neta/if_mvneta.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c index 1ddd95cced78..c94e91b16013 100644 --- a/sys/dev/neta/if_mvneta.c +++ b/sys/dev/neta/if_mvneta.c @@ -2792,6 +2792,7 @@ mvneta_tx_set_csumflag(struct ifnet *ifp, struct mvneta_tx_desc *t, struct mbuf *m) { struct ether_header *eh; + struct ether_vlan_header *evh; int csum_flags; uint32_t iphl, ipoff; struct ip *ip; @@ -2806,6 +2807,9 @@ mvneta_tx_set_csumflag(struct ifnet *ifp, break; case ETHERTYPE_VLAN: ipoff = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN; + evh = mtod(m, struct ether_vlan_header *); + if (ntohs(evh->evl_proto) == ETHERTYPE_VLAN) + ipoff += ETHER_VLAN_ENCAP_LEN; break; default: csum_flags = 0;