summaryrefslogtreecommitdiff
path: root/sys/net/if_vlan.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-04-18 03:29:19 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-04-18 03:29:19 +0000
commit55946cea49e2a23e38d27294946f439b2e4bcb08 (patch)
tree15635671c2b4380cd73c74b7d7f840e51d52dfed /sys/net/if_vlan.c
parent3daadc982444f5df5781e918368c74960095a18c (diff)
revert a change in the previous commit to appease henning@ for the time
being.. - Set the interface speed back to zero after ether_ifattach(). RFC 2863 says: "For a sub-layer which has no concept of bandwidth, [ifSpeed] should be zero."
Diffstat (limited to 'sys/net/if_vlan.c')
-rw-r--r--sys/net/if_vlan.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 105f254c215..f71601f63eb 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.49 2005/04/17 23:02:02 brad Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.50 2005/04/18 03:29:18 brad Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
*
@@ -139,7 +139,6 @@ vlan_clone_create(struct if_clone *ifc, int unit)
if_attach(ifp);
ether_ifattach(ifp);
/* Now undo some of the damage... */
- ifp->if_baudrate = 0;
ifp->if_type = IFT_8021_VLAN;
ifp->if_hdrlen = EVL_ENCAPLEN;
@@ -430,6 +429,12 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, u_int16_t tag)
ifv->ifv_if.if_type = p->if_type;
/*
+ * Inherit baudrate from the parent. An SNMP agent would use this
+ * information.
+ */
+ ifv->ifv_if.if_baudrate = p->if_baudrate;
+
+ /*
* If the parent interface can do hardware-assisted
* VLAN encapsulation, then propagate its hardware-
* assisted checksumming flags.