Attachment 15826 Details for Bug 29235 – file.diff

[patch] file.diff

file.diff (text/plain), 1.96 KB, created by peter.jeremy on 2001-07-25 22:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: peter.jeremy

Created: 2001-07-25 22:40:27 UTC

Size: 1.96 KB

patch

obsolete

>Index: modules/tx/Makefile
>===================================================================
>RCS file: /home/CVSROOT/src/sys/modules/tx/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- modules/tx/Makefile	2001/01/06 14:00:32	1.5
>+++ modules/tx/Makefile	2001/01/07 21:03:07
>@@ -1,9 +1,12 @@
> # $FreeBSD: src/sys/modules/tx/Makefile,v 1.5 2001/01/06 14:00:32 obrien Exp $
> 
> .PATH: ${.CURDIR}/../../pci
>-
> KMOD=	if_tx
>-SRCS=	if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h
>+SRCS=	if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h vlan.h
> SRCS+=	miibus_if.h
>+CLEANFILES= vlan.h
>+
>+vlan.h:
>+	touch vlan.h
> 
> .include <bsd.kmod.mk>
>Index: pci/if_tx.c
>===================================================================
>RCS file: /home/CVSROOT/src/sys/pci/if_tx.c,v
>retrieving revision 1.46
>diff -u -r1.46 if_tx.c
>--- pci/if_tx.c	2001/06/23 19:30:26	1.46
>+++ pci/if_tx.c	2001/07/02 15:17:59
>@@ -54,13 +54,21 @@
> #if defined(__FreeBSD__)
> #define NBPFILTER	1
> 
>+#include "vlan.h"
>+
> #include <net/if.h>
> #include <net/if_arp.h>
> #include <net/ethernet.h>
> #include <net/if_media.h>
> 
>+#if NBPF > 0
> #include <net/bpf.h>
>+#endif
> 
>+#if NVLAN > 0
>+#include <net/if_vlan_var.h>
>+#endif
>+
> #include <vm/vm.h>              /* for vtophys */
> #include <vm/pmap.h>            /* for vtophys */
> #include <machine/bus_memio.h>
>@@ -85,6 +93,8 @@
> #else /* __OpenBSD__ */
> #include "bpfilter.h"
> 
>+#define	NVLAN	0	/* not sure if/how OpenBSD supports VLANs */
>+
> #include <sys/device.h>
> 
> #include <net/if.h>
>@@ -555,6 +565,9 @@
> 
> 	/* Attach to OS's managers */
> 	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
>+#if NVLAN > 0
>+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
>+#endif
> 	callout_handle_init(&sc->stat_ch);
> 
> fail:
>@@ -1745,8 +1758,11 @@
> 			return -1;
> 		}
> 		desc->bufaddr = vtophys( mtod(buf->mbuf,caddr_t) );
>-
>+#if NVLAN > 0
>+		desc->buflength = ETHER_MAX_FRAME_LEN + EVL_ENCAPLEN;
>+#else
> 		desc->buflength = ETHER_MAX_FRAME_LEN;
>+#endif
> 		desc->status = 0x8000;			/* Give to EPIC */
> 
> 	}

Actions: View | Diff

Attachments on bug 29235: 15826