Module Name: src
Committed By: snj
Date: Tue Oct 24 08:39:00 UTC 2017
Modified Files:
src/sys/arch/powerpc/booke/dev [netbsd-8]: pq3etsec.c
src/sys/arch/x86/pci [netbsd-8]: if_vmx.c
src/sys/dev/ic [netbsd-8]: i82557.c rtl8169.c
src/sys/dev/pci [netbsd-8]: if_age.c if_alc.c if_ale.c if_bge.c
if_bnx.c if_jme.c if_nfe.c if_sip.c if_stge.c if_ti.c if_txp.c
if_vge.c if_wm.c
src/sys/dev/pci/cxgb [netbsd-8]: cxgb_sge.c
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c
src/sys/net [netbsd-8]: if_ether.h if_ethersubr.c if_vlan.c
src/sys/net/agr [netbsd-8]: if_agrether_hash.c
src/sys/net80211 [netbsd-8]: ieee80211_input.c ieee80211_output.c
src/sys/sys [netbsd-8]: mbuf.h
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #302):
sys/arch/powerpc/booke/dev/pq3etsec.c: 1.30-1.31
sys/arch/x86/pci/if_vmx.c: 1.20
sys/dev/ic/i82557.c: 1.148
sys/dev/ic/rtl8169.c: 1.152
sys/dev/pci/cxgb/cxgb_sge.c: 1.5
sys/dev/pci/if_age.c: 1.51
sys/dev/pci/if_alc.c: 1.25
sys/dev/pci/if_ale.c: 1.23
sys/dev/pci/if_bge.c: 1.311
sys/dev/pci/if_bge.c: 1.312
sys/dev/pci/if_bnx.c: 1.62
sys/dev/pci/if_jme.c: 1.32
sys/dev/pci/if_nfe.c: 1.64
sys/dev/pci/if_sip.c: 1.167
sys/dev/pci/if_stge.c: 1.63-1.64
sys/dev/pci/if_ti.c: 1.102
sys/dev/pci/if_txp.c: 1.48
sys/dev/pci/if_vge.c: 1.61
sys/dev/pci/if_wm.c: 1.538
sys/dev/pci/ixgbe/ix_txrx.c: 1.29 via patch
sys/net/agr/if_agrether_hash.c: 1.4
sys/net/if_ether.h: 1.67-1.68
sys/net/if_ethersubr.c: 1.244
sys/net/if_vlan.c: 1.100
sys/net80211/ieee80211_input.c: 1.89
sys/net80211/ieee80211_output.c: 1.59
sys/sys/mbuf.h: 1.171
VLAN ID uses pkthdr instead of mtag now. Contributed by s-yamaguchi@IIJ.
I just commit by proxy. Reviewed by joerg@n.o and christos@n.o, thanks.
See http://mail-index.netbsd.org/tech-net/2017/09/26/msg006459.html
--
only get vtag when we have vtag like the other drivers.
--
- only get the vtag if we have it like the other drivers
- mask the hardware vlan tag
--
- add a constant for the vlan mask.
- enforce that we have a tag before we get it.
only get vtag when we have vtag like the other drivers.
like if_bge.c:1.312 and if_stge.c:1.64.
fixed by s-yamaguchi@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/arch/x86/pci/if_vmx.c
cvs rdiff -u -r1.147 -r1.147.6.1 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.151 -r1.151.2.1 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.310 -r1.310.2.1 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/dev/pci/if_nfe.c
cvs rdiff -u -r1.166 -r1.166.2.1 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.101 -r1.101.8.1 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.508.4.3 -r1.508.4.4 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/dev/pci/cxgb/cxgb_sge.c
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/net/if_ether.h
cvs rdiff -u -r1.242 -r1.242.6.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.97.2.2 -r1.97.2.3 src/sys/net/if_vlan.c
cvs rdiff -u -r1.3 -r1.3.114.1 src/sys/net/agr/if_agrether_hash.c
cvs rdiff -u -r1.88 -r1.88.6.1 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/net80211/ieee80211_output.c
cvs rdiff -u -r1.170 -r1.170.2.1 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
