Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supports ETHERCAP_VLAN_MTU. Tested on sbus hme on Ultra/1.

Browse Source 
Thanks to Andrei Petrov for the hint !
This commit is contained in:
bouyer 2000-11-17 19:08:00 +00:00
parent 2168a74f89
commit 42681a6a9f
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/ic/hme.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hme.c,v 1.18 2000/11/15 01:02:16 thorpej Exp $ */
/* $NetBSD: hme.c,v 1.19 2000/11/17 19:08:00 bouyer Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -302,6 +302,9 @@ hme_config(sc)
ifmedia_set(&sc->sc_media, IFM_ETHER|IFM_AUTO);
}
/* claim 802.1q capability */
sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
/* Attach the interface. */
if_attach(ifp);
ether_ifattach(ifp, sc->sc_enaddr);
@ -502,6 +505,10 @@ hme_init(sc)
bus_space_write_4(t, mac, HME_MACI_FCCNT, 0);
bus_space_write_4(t, mac, HME_MACI_EXCNT, 0);
bus_space_write_4(t, mac, HME_MACI_LTCNT, 0);
bus_space_write_4(t, mac, HME_MACI_TXSIZE,
(sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) ?
ETHER_VLAN_ENCAP_LEN + ETHER_MAX_LEN :
ETHER_MAX_LEN);
/* Load station MAC address */
ea = sc->sc_enaddr;
@ -528,6 +535,10 @@ hme_init(sc)
bus_space_write_4(t, etx, HME_ETXI_RSIZE, sc->sc_rb.rb_ntbuf);
bus_space_write_4(t, erx, HME_ERXI_RING, sc->sc_rb.rb_rxddma);
bus_space_write_4(t, mac, HME_MACI_RXSIZE,
(sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) ?
ETHER_VLAN_ENCAP_LEN + ETHER_MAX_LEN :
ETHER_MAX_LEN);
/* step 8. Global Configuration & Interrupt Mask */
@ -749,7 +760,9 @@ hme_read(sc, ix, len)
struct mbuf *m;
if (len <= sizeof(struct ether_header) ||
len > ETHERMTU + sizeof(struct ether_header)) {
len > ((sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) ?
ETHER_VLAN_ENCAP_LEN + ETHERMTU + sizeof(struct ether_header) :
ETHERMTU + sizeof(struct ether_header))) {
#ifdef HMEDEBUG
printf("%s: invalid packet size %d; dropping\n",
sc->sc_dev.dv_xname, len);

15
sys/dev/ic/hmereg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hmereg.h,v 1.5 2000/06/25 01:05:17 eeh Exp $ */
/* $NetBSD: hmereg.h,v 1.6 2000/11/17 19:08:00 bouyer Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -111,6 +111,17 @@
HME_SEB_STAT_RFIFOVF | HME_SEB_STAT_LCNTEXP | HME_SEB_STAT_CCNTEXP |\
HME_SEB_STAT_ACNTEXP)
#define HME_SEB_STAT_VLAN_ERRORS \
(HME_SEB_STAT_SLVPERR | HME_SEB_STAT_SLVERR | HME_SEB_STAT_TXTERR |\
HME_SEB_STAT_TXPERR | HME_SEB_STAT_TXLERR | HME_SEB_STAT_TXEACK |\
HME_SEB_STAT_EOPERR | HME_SEB_STAT_RXTERR | HME_SEB_STAT_RXPERR |\
HME_SEB_STAT_RXLATERR | HME_SEB_STAT_RXERR | HME_SEB_STAT_NORXD |\
HME_SEB_STAT_DTIMEXP | HME_SEB_STAT_FCNTEXP | HME_SEB_STAT_LCCNTEXP |\
HME_SEB_STAT_ECNTEXP | HME_SEB_STAT_NCNTEXP | \
HME_SEB_STAT_TFIFO_UND| HME_SEB_STAT_STSTERR | HME_SEB_STAT_CVCNTEXP |\
HME_SEB_STAT_RFIFOVF | HME_SEB_STAT_LCNTEXP | HME_SEB_STAT_CCNTEXP |\
HME_SEB_STAT_ACNTEXP)
/*
* HME Transmitter register offsets
*/
@ -167,6 +178,7 @@
#define HME_MACI_TXSWRST (130*4) /* TX reset */
#define HME_MACI_TXCFG (131*4) /* TX config */
#define HME_MACI_JSIZE (139*4) /* TX jam size */
#define HME_MACI_TXSIZE (140*4) /* TX max size */
#define HME_MACI_NCCNT (144*4) /* TX normal collision cnt */
#define HME_MACI_FCCNT (145*4) /* TX first collision cnt */
#define HME_MACI_EXCNT (146*4) /* TX excess collision cnt */
@ -174,6 +186,7 @@
#define HME_MACI_RANDSEED (148*4) /* */
#define HME_MACI_RXSWRST (194*4) /* RX reset */
#define HME_MACI_RXCFG (195*4) /* RX config */
#define HME_MACI_RXSIZE (196*4) /* RX max size */
#define HME_MACI_MACADDR2 (198*4) /* MAC address */
#define HME_MACI_MACADDR1 (199*4)
#define HME_MACI_MACADDR0 (200*4)