diff options
| author |   damien <damien@openbsd.org> | 2008-12-02 17:37:11 +0000 |
|---|---|---|
| committer | damien <damien@openbsd.org> | 2008-12-02 17:37:11 +0000 |
| commit | 0cb2bd1b9281caa088a5970695ce72280751a35d (patch) | |
| tree | fee3dda9f052ef70d64e605d7a265bc4fdb3358a | |
| parent | Add code for 5150 support (not tested since I don't have the hardware and (diff) | |
| download | wireguard-openbsd-0cb2bd1b9281caa088a5970695ce72280751a35d.tar.xz wireguard-openbsd-0cb2bd1b9281caa088a5970695ce72280751a35d.zip | |
cleanup ieee80211_classify(): retrieve VLAN tag from m_pkthdr.ether_vtag.
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index bda6a3cb115..bd2e55a90bf 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.79 2008/09/27 15:16:09 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.80 2008/12/02 17:37:11 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -404,13 +404,8 @@ ieee80211_classify(struct ieee80211com *ic, struct mbuf *m) u_int8_t ds_field; #endif #if NVLAN > 0 - if ((m->m_flags & M_PROTO1) == M_PROTO1 && m->m_pkthdr.rcvif != NULL) { - struct ifvlan *ifv = m->m_pkthdr.rcvif->if_softc; - - /* use VLAN 802.1D user-priority */ - if (ifv->ifv_prio <= 7) - return ifv->ifv_prio; - } + if (m->m_flags & M_VLANTAG) /* use VLAN 802.1D user-priority */ + return EVL_PRIOFTAG(m->m_pkthdr.ether_vtag); #endif #ifdef INET eh = mtod(m, struct ether_header *); |