From owner-freebsd-net@FreeBSD.ORG Sun Feb 11 07:31:57 2007 Return-Path: X-Original-To: freebsd-net@freebsd.org Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1116B16A400 for ; Sun, 11 Feb 2007 07:31:57 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.181]) by mx1.freebsd.org (Postfix) with ESMTP id BE3EC13C442 for ; Sun, 11 Feb 2007 07:31:56 +0000 (UTC) (envelope-from pyunyh@gmail.com) Received: by py-out-1112.google.com with SMTP id f47so651730pye for ; Sat, 10 Feb 2007 23:31:56 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:from:to:cc:subject:message-id:reply-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=HU7U0XEpd0rCzOnQZBPpJ/MSbS048nFk+MpZLCgx02cc7Vi2cVYnWZZLYBFm7fsYIUSYHVr4O2Aw6jUybAASQmQ1QvCCTl/ClUolCyL5EU0lYUhP5mv86yWcvNCjZH48/azPlknz82vHOzNjaPiAS5guOdZHMbti/F4XV4EAdQg= Received: by 10.35.128.17 with SMTP id f17mr26995301pyn.1171179116157; Sat, 10 Feb 2007 23:31:56 -0800 (PST) Received: from michelle.cdnetworks.co.kr ( [211.53.35.84]) by mx.google.com with ESMTP id 37sm7663738nzf.2007.02.10.23.31.54; Sat, 10 Feb 2007 23:31:55 -0800 (PST) Received: from michelle.cdnetworks.co.kr (localhost.cdnetworks.co.kr [127.0.0.1]) by michelle.cdnetworks.co.kr (8.13.5/8.13.5) with ESMTP id l1B7XSII055792 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 11 Feb 2007 16:33:28 +0900 (KST) (envelope-from pyunyh@gmail.com) Received: (from yongari@localhost) by michelle.cdnetworks.co.kr (8.13.5/8.13.5/Submit) id l1B7XSVx055791; Sun, 11 Feb 2007 16:33:28 +0900 (KST) (envelope-from pyunyh@gmail.com) Date: Sun, 11 Feb 2007 16:33:28 +0900 From: Pyun YongHyeon To: "Bruce M. Simpson" Message-ID: <20070211073328.GB55314@cdnetworks.co.kr> References: <45CDFA18.3030102@incunabulum.net> <45CE0ED9.1010905@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="2oS5YaxWCcQjTEyO" Content-Disposition: inline In-Reply-To: <45CE0ED9.1010905@FreeBSD.org> User-Agent: Mutt/1.4.2.1i Cc: freebsd-net@FreeBSD.org Subject: Re: [PATCH] Part 2 of low level 802.1p priority support X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pyunyh@gmail.com List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Feb 2007 07:31:57 -0000 --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Feb 10, 2007 at 06:28:41PM +0000, Bruce M. Simpson wrote: > This updated patch moves VLAN tag decapsulation into if_ethersubr.c and > always uses M_VLANTAG, which is also passed to the upper layer. > > Tests with ping: > fxp (no VLAN_HWTAGGING support) OK > msk (VLAN_HWTAGGING enabled) OK > msk (VLAN_HWTAGGING disanabled) FAIL > > I am concerned that this may need review and testing to support > situations where we do nested VLANs or with bridge(4) before it can be > committed. > > Further testing with drivers is needed (I can't be 100% sure it fails > with msk(4) because something strange is happening when vlan tagging is > turned off). Perhaps Pyun knows? > I guess I've not merged local changes before committing to HEAD. How about attached one? > Regards, > BMS > > -- Regards, Pyun YongHyeon --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="if_msk.vlan.patch" Index: if_msk.c =================================================================== RCS file: /home/ncvs/src/sys/dev/msk/if_msk.c,v retrieving revision 1.8 diff -u -r1.8 if_msk.c --- if_msk.c 9 Jan 2007 01:31:22 -0000 1.8 +++ if_msk.c 11 Feb 2007 07:26:08 -0000 @@ -3029,7 +3029,8 @@ cons = sc_if->msk_cdata.msk_rx_cons; do { rxlen = status >> 16; - if ((status & GMR_FS_VLAN) != 0) + if ((status & GMR_FS_VLAN) != 0 && + (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) rxlen -= ETHER_VLAN_ENCAP_LEN; if (len > sc_if->msk_framesize || ((status & GMR_FS_ANY_ERR) != 0) || --2oS5YaxWCcQjTEyO--