From owner-cvs-all@FreeBSD.ORG Thu Feb 22 15:42:42 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB90416A404; Thu, 22 Feb 2007 15:42:42 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out5.smtp.messagingengine.com (out5.smtp.messagingengine.com [66.111.4.29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C10713C4A3; Thu, 22 Feb 2007 15:42:42 +0000 (UTC) (envelope-from bms@FreeBSD.org) Received: from out1.internal (unknown [10.202.2.149]) by out1.messagingengine.com (Postfix) with ESMTP id 7F8831CBBB0; Thu, 22 Feb 2007 10:44:09 -0500 (EST) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by out1.internal (MEProxy); Thu, 22 Feb 2007 10:44:09 -0500 X-Sasl-enc: 4Ybb8m2qHYOwNhcPUJNys5yX3Q9AHTkR0ZIzFoQAQ6L3 1172159049 Received: from [192.168.123.18] (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTP id A84781A541; Thu, 22 Feb 2007 10:44:08 -0500 (EST) Message-ID: <45DDB9EF.50201@FreeBSD.org> Date: Thu, 22 Feb 2007 15:42:39 +0000 From: "Bruce M. Simpson" User-Agent: Thunderbird 1.5.0.9 (X11/20070125) MIME-Version: 1.0 To: "Christian S.J. Peron" References: <200702221450.l1MEoV0O007216@repoman.freebsd.org> In-Reply-To: <200702221450.l1MEoV0O007216@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/net if_ethersubr.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2007 15:42:42 -0000 Christian S.J. Peron wrote: > Use ETHER_BPF_MTAP() instead of BPF_MTAP() here. It's possible > incoming packets have had their 802.1Q tags processed by the > hardware, resulting in them being stripped from the packets, and > placed on the mbuf. This fixes the processing of 802.1Q tags when > hardware offload of 802.1Q tags is enabled. > Thanks for this change. I have integrated it into my local checkout containing the 802.1p/q rewrite as it is needed there to do the right thing when M_VLANTAG is *always* used even when the cards themselves do not do VLAN hwtagging. I have moved the 802.1p/q decapsulation to ether_input() itself as per thompsa@'s suggestion. I should really use p4 (or Hg) for this next time around... BMS