From owner-cvs-src@FreeBSD.ORG Thu Feb 15 06:21:34 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B2C1B16A400; Thu, 15 Feb 2007 06:21:34 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8D57913C441; Thu, 15 Feb 2007 06:21:34 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1F6LYQR061923; Thu, 15 Feb 2007 06:21:34 GMT (envelope-from yongari@repoman.freebsd.org) Received: (from yongari@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1F6LYLT061922; Thu, 15 Feb 2007 06:21:34 GMT (envelope-from yongari) Message-Id: <200702150621.l1F6LYLT061922@repoman.freebsd.org> From: Pyun YongHyeon Date: Thu, 15 Feb 2007 06:21:34 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/msk if_msk.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: Thu, 15 Feb 2007 06:21:34 -0000 yongari 2007-02-15 06:21:34 UTC FreeBSD src repository Modified files: sys/dev/msk if_msk.c Log: Unbreak non-H/W VLAN extraction case. Unlike other GigEs Yukon II always set VLAN bit when it detects VLAN tagged packet regardless of H/W VLAN processing configuration state. So it need to check IFCAP_VLAN_HWTAGGING bit to know whether driver is configured to take advantage of H/W VLAN processing. If H/W VLAN processing was disabled don't adjust received packet length such that subsequent validation logic works for software VLAN processing. Reported by: bms Tested by: bms Revision Changes Path 1.9 +4 -2 src/sys/dev/msk/if_msk.c