diff options
| author | glebius <glebius@FreeBSD.org> | 2006-01-30 13:45:15 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2006-01-30 13:45:15 +0000 |
| commit | 19f8b36e662bea1b79c01dab7717540417040328 (patch) | |
| tree | 411b1579c38fee9f7f11cf8181e2190d0215dd36 /sys/net/if_ethersubr.c | |
| parent | a388ebb962934fe140e9559cc12ca537afae2187 (diff) | |
| download | FreeBSD-src-19f8b36e662bea1b79c01dab7717540417040328.zip FreeBSD-src-19f8b36e662bea1b79c01dab7717540417040328.tar.gz | |
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 9a5ffc3..4f9d119 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -623,7 +623,7 @@ ether_demux(struct ifnet *ifp, struct mbuf *m) if (!(ifp->if_bridge) && !((ether_type == ETHERTYPE_VLAN || m->m_flags & M_VLANTAG) && - ifp->if_nvlans > 0)) { + ifp->if_vlantrunk != NULL)) { #ifdef DEV_CARP /* * XXX: Okay, we need to call carp_forus() and - if it is for @@ -696,7 +696,7 @@ post_stats: /* * If no VLANs are configured, drop. */ - if (ifp->if_nvlans == 0) { + if (ifp->if_vlantrunk == NULL) { ifp->if_noproto++; m_freem(m); return; @@ -716,7 +716,7 @@ post_stats: */ switch (ether_type) { case ETHERTYPE_VLAN: - if (ifp->if_nvlans != 0) { + if (ifp->if_vlantrunk != NULL) { KASSERT(vlan_input_p,("ether_input: VLAN not loaded!")); (*vlan_input_p)(ifp, m); } else { |
