From owner-cvs-src@FreeBSD.ORG  Tue Jul  8 14:54:23 2003
Return-Path: <owner-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 2C36E37B401; Tue,  8 Jul 2003 14:54:23 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BA8E343F3F; Tue,  8 Jul 2003 14:54:22 -0700 (PDT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h68LsM0U021433;
	Tue, 8 Jul 2003 14:54:22 -0700 (PDT)
	(envelope-from wpaul@repoman.freebsd.org)
Received: (from wpaul@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h68LsMQm021423;
	Tue, 8 Jul 2003 14:54:22 -0700 (PDT)
Message-Id: <200307082154.h68LsMQm021423@repoman.freebsd.org>
From: Bill Paul <wpaul@FreeBSD.org>
Date: Tue, 8 Jul 2003 14:54:20 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/net if_vlan.c if_vlan_var.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jul 2003 21:54:23 -0000

wpaul       2003/07/08 14:54:20 PDT

  FreeBSD src repository

  Modified files:
    sys/net              if_vlan.c if_vlan_var.h 
  Log:
  - In vlan_input(), always mask off all but the VLID bits from tags
    extracted from received frames, both in the IFCAP_VLAN_HWTAGGING case
    and not. (Some drivers may already do this masking internally, but
    doing it here doesn't hurt and insures consistency.)
  
  - In vlan_ioctl(), don't let the user set a VLAN ID value with anything
    besides the VLID bits set, otherwise we will have trouble matching
    an interface in vlan_input() later.
  
  PR:             kern/46405
  
  Revision  Changes    Path
  1.51      +10 -2     src/sys/net/if_vlan.c
  1.16      +2 -1      src/sys/net/if_vlan_var.h