Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/sys/net Pull up revisions 1.1-1.4 (new) (requested by b...



details:   https://anonhg.NetBSD.org/src/rev/b9e36f344362
branches:  netbsd-1-5
changeset: 490460:b9e36f344362
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Dec 31 20:14:35 2000 +0000

description:
Pull up revisions 1.1-1.4 (new) (requested by bouyer):
        Add support for 802.1Q virtual LANs.

diffstat:

 sys/net/if_vlanvar.h |  98 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)

diffs (102 lines):

diff -r 8e4809604043 -r b9e36f344362 sys/net/if_vlanvar.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/net/if_vlanvar.h      Sun Dec 31 20:14:35 2000 +0000
@@ -0,0 +1,98 @@
+/*     $NetBSD: if_vlanvar.h,v 1.4.4.2 2000/12/31 20:14:35 jhawk Exp $ */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Doran.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright 1998 Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that both the above copyright notice and this
+ * permission notice appear in all copies, that both the above
+ * copyright notice and this permission notice appear in all
+ * supporting documentation, and that the name of M.I.T. not be used
+ * in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  M.I.T. makes
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+ * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from FreeBSD: if_vlan_var.h,v 1.3 1999/08/28 00:48:24 peter Exp
+ */
+
+#ifndef _NET_IF_VLANVAR_H_
+#define        _NET_IF_VLANVAR_H_
+
+struct ether_vlan_header {
+       u_int8_t        evl_dhost[ETHER_ADDR_LEN];
+       u_int8_t        evl_shost[ETHER_ADDR_LEN];
+       u_int16_t       evl_encap_proto;
+       u_int16_t       evl_tag;
+       u_int16_t       evl_proto;
+} __attribute__((__packed__));
+
+#define        EVL_VLANOFTAG(tag)      ((tag) & 4095)
+#define        EVL_PRIOFTAG(tag)       (((tag) >> 13) & 7)
+
+/* Configuration structure for SIOCSETVLAN and SIOCGETVLAN ioctls. */
+struct vlanreq {
+       char    vlr_parent[IFNAMSIZ];
+       u_short vlr_tag;
+};
+
+#define        SIOCSETVLAN     SIOCSIFGENERIC
+#define        SIOCGETVLAN     SIOCGIFGENERIC
+
+#ifdef _KERNEL
+void   vlan_input(struct ifnet *, struct mbuf *);
+void   vlan_ifdetach(struct ifnet *);
+#endif /* _KERNEL */
+
+#endif /* !_NET_IF_VLANVAR_H_ */



Home | Main Index | Thread Index | Old Index