Deleted Added
full compact
if_vlan_var.h (60833) if_vlan_var.h (60938)
1/*
2 * Copyright 1998 Massachusetts Institute of Technology
3 *
4 * Permission to use, copy, modify, and distribute this software and
5 * its documentation for any purpose and without fee is hereby
6 * granted, provided that both the above copyright notice and this
7 * permission notice appear in all copies, that both the above
8 * copyright notice and this permission notice appear in all

--- 12 unchanged lines hidden (view full) ---

21 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*
2 * Copyright 1998 Massachusetts Institute of Technology
3 *
4 * Permission to use, copy, modify, and distribute this software and
5 * its documentation for any purpose and without fee is hereby
6 * granted, provided that both the above copyright notice and this
7 * permission notice appear in all copies, that both the above
8 * copyright notice and this permission notice appear in all

--- 12 unchanged lines hidden (view full) ---

21 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
26 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/sys/net/if_vlan_var.h 60833 2000-05-23 20:41:01Z jake $
29 * $FreeBSD: head/sys/net/if_vlan_var.h 60938 2000-05-26 02:09:24Z jake $
30 */
31
32#ifndef _NET_IF_VLAN_VAR_H_
33#define _NET_IF_VLAN_VAR_H_ 1
34
35#ifdef _KERNEL
36struct vlan_mc_entry {
37 struct ether_addr mc_addr;
30 */
31
32#ifndef _NET_IF_VLAN_VAR_H_
33#define _NET_IF_VLAN_VAR_H_ 1
34
35#ifdef _KERNEL
36struct vlan_mc_entry {
37 struct ether_addr mc_addr;
38 SLIST_ENTRY(struct vlan_mc_entry) mc_entries;
38 SLIST_ENTRY(vlan_mc_entry) mc_entries;
39};
40
41struct ifvlan {
42 struct arpcom ifv_ac; /* make this an interface */
43 struct ifnet *ifv_p; /* parent inteface of this vlan */
44 struct ifv_linkmib {
45 int ifvm_parent;
46 u_int16_t ifvm_proto; /* encapsulation ethertype */
47 u_int16_t ifvm_tag; /* tag to apply on packets leaving if */
48 } ifv_mib;
39};
40
41struct ifvlan {
42 struct arpcom ifv_ac; /* make this an interface */
43 struct ifnet *ifv_p; /* parent inteface of this vlan */
44 struct ifv_linkmib {
45 int ifvm_parent;
46 u_int16_t ifvm_proto; /* encapsulation ethertype */
47 u_int16_t ifvm_tag; /* tag to apply on packets leaving if */
48 } ifv_mib;
49 SLIST_HEAD(__vlan_mchead, struct vlan_mc_entry) vlan_mc_listhead;
49 SLIST_HEAD(__vlan_mchead, vlan_mc_entry) vlan_mc_listhead;
50};
51#define ifv_if ifv_ac.ac_if
52#define ifv_tag ifv_mib.ifvm_tag
53#endif /* _KERNEL */
54
55struct ether_vlan_header {
56 u_char evl_dhost[ETHER_ADDR_LEN];
57 u_char evl_shost[ETHER_ADDR_LEN];

--- 35 unchanged lines hidden ---
50};
51#define ifv_if ifv_ac.ac_if
52#define ifv_tag ifv_mib.ifvm_tag
53#endif /* _KERNEL */
54
55struct ether_vlan_header {
56 u_char evl_dhost[ETHER_ADDR_LEN];
57 u_char evl_shost[ETHER_ADDR_LEN];

--- 35 unchanged lines hidden ---