diff options
author | 2007-09-01 10:26:25 +0000 | |
---|---|---|
committer | 2007-09-01 10:26:25 +0000 | |
commit | d2c96f882ae99c6bdf2d7aa6fcc84abcf2f29cbe (patch) | |
tree | 074a0c3b47595ebb2dc4af1c862735bef3e1238d | |
parent | Remove stale comments; prompted by millert. (diff) | |
download | wireguard-openbsd-d2c96f882ae99c6bdf2d7aa6fcc84abcf2f29cbe.tar.xz wireguard-openbsd-d2c96f882ae99c6bdf2d7aa6fcc84abcf2f29cbe.zip |
Add VLAN reception support to vr(4). Diff from Brad.
OK claudio@
-rw-r--r-- | sys/dev/pci/if_vr.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_vrreg.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index a7fe1c8783c..ccb7452ae29 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.67 2006/11/03 23:45:26 brad Exp $ */ +/* $OpenBSD: if_vr.c,v 1.68 2007/09/01 10:26:25 mglocker Exp $ */ /* * Copyright (c) 1997, 1998 @@ -766,6 +766,8 @@ vr_attach(struct device *parent, struct device *self, void *aux) IFQ_SET_READY(&ifp->if_snd); bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); + ifp->if_capabilities = IFCAP_VLAN_MTU; + /* * Do MII setup. */ diff --git a/sys/dev/pci/if_vrreg.h b/sys/dev/pci/if_vrreg.h index 6ecec0535cf..4375b0f62eb 100644 --- a/sys/dev/pci/if_vrreg.h +++ b/sys/dev/pci/if_vrreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vrreg.h,v 1.17 2006/02/05 18:23:37 brad Exp $ */ +/* $OpenBSD: if_vrreg.h,v 1.18 2007/09/01 10:26:25 mglocker Exp $ */ /* * Copyright (c) 1997, 1998 @@ -393,7 +393,7 @@ struct vr_desc { #define VR_RX_LIST_CNT 64 #define VR_TX_LIST_CNT 128 #define VR_MIN_FRAMELEN 60 -#define VR_RXLEN 1520 +#define VR_RXLEN 1524 #define VR_TXOWN(x) x->vr_ptr->vr_status |