diff options
| -rw-r--r-- | sys/net/if_vlan.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 55af9c9..34ef7ee 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -917,15 +917,21 @@ vlan_input(struct ifnet *ifp, struct mbuf *m) __func__, ntohs(evl->evl_encap_proto))); tag = EVL_VLANOFTAG(ntohs(evl->evl_tag)); + + /* + * Restore the original ethertype. We'll remove + * the encapsulation after we've found the vlan + * interface corresponding to the tag. + */ + evl->evl_encap_proto = evl->evl_proto; break; default: -#ifdef DEBUG - /* XXX rate limit? */ - if_printf(ifp, "unsupported if_type %u", ifp->if_type); + tag = (uint16_t) -1; +#ifdef INVARIANTS + panic("%s: unsupported if_type (%u)", + __func__, ifp->if_type); #endif - m_freem(m); - ifp->if_noproto++; /* XXX? */ - return; + break; } } @@ -946,12 +952,12 @@ vlan_input(struct ifnet *ifp, struct mbuf *m) if (mtag == NULL) { /* * Packet had an in-line encapsulation header; - * remove it. Note that we leave the type field - * unchanged; we only copy up the mac addresses. + * remove it. The original header has already + * been fixed up above. */ bcopy(mtod(m, caddr_t), mtod(m, caddr_t) + ETHER_VLAN_ENCAP_LEN, - ETHER_HDR_LEN - ETHER_TYPE_LEN); + ETHER_HDR_LEN); m_adj(m, ETHER_VLAN_ENCAP_LEN); } |
