From owner-cvs-src@FreeBSD.ORG Fri Sep 29 18:23:58 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A54BD16A415; Fri, 29 Sep 2006 18:23:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8773043D7D; Fri, 29 Sep 2006 18:23:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k8TINmeS017072; Fri, 29 Sep 2006 14:23:48 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Andre Oppermann Date: Fri, 29 Sep 2006 14:23:46 -0400 User-Agent: KMail/1.9.1 References: <200609291347.k8TDld9N079956@repoman.freebsd.org> In-Reply-To: <200609291347.k8TDld9N079956@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200609291423.46738.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 29 Sep 2006 14:23:48 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1950/Thu Sep 28 10:11:54 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/em if_em.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Sep 2006 18:23:58 -0000 On Friday 29 September 2006 09:47, Andre Oppermann wrote: > andre 2006-09-29 13:47:39 UTC > > FreeBSD src repository > > Modified files: > sys/dev/em if_em.c > Log: > Remove manual vlan header insertion in em_encap(). It is unnecessary as the > generic vlan_start() takes care of it when vlan hardware insertion is disabled. > > In em_set_promisc() add a note that BPF may also be enabled without going into > promisc mode. > > Reviewed by: jfv Umm, you just broke things. You are still disabling vlan header insertion in hardware but you haven't turned off the capability (which you can't do safely anyway since you still might have packets in flight that have a vlan tag after you turn off the capability) so the generic vlan layer is going to keep sending packets with vlan tags. The more complete patch I had sent to Prafulla, Jack, and others stopped disabling vlan tagging in hardware altogether and instead is going to require the other parts of the stack (like bpf) to handle vlan tags that are in mtag (or in 7.x, in the mbuf header) rather than inline in the packet data. -- John Baldwin