d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix typo in "didn't find tag in list" code -- != should have been ==.

Browse Source 
This fixes the panic when receiving a packet with an unknown tag, and
  also allows reception of packets with known tags.
- Allow overlapping tag number spaces when using multiple hardware-assisted
  VLAN parent devices (by comparing the parent interface in
  vlan_input_tag() just as in vlan_input() ).
- fix typo in comment

MFC after:	1 week
This commit is contained in:
Bill Fenner 2001-10-06 05:02:11 +00:00
parent 887f6fb8d4
commit 242c766b79
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/if_vlan.c
View File

@ -403,11 +403,12 @@ vlan_input_tag(struct ether_header *eh, struct mbuf *m, u_int16_t t)
for (ifv = LIST_FIRST(&ifv_list); ifv != NULL;
ifv = LIST_NEXT(ifv, ifv_list)) {
if (ifv->ifv_tag == t)
if (m->m_pkthdr.rcvif == ifv->ifv_p
&& ifv->ifv_tag == t)
break;
}
if (ifv !=NULL || (ifv->ifv_if.if_flags & IFF_UP) == 0) {
if (ifv == NULL || (ifv->ifv_if.if_flags & IFF_UP) == 0) {
m_free(m);
return -1; /* So the parent can take note */
}
@ -415,7 +416,7 @@ vlan_input_tag(struct ether_header *eh, struct mbuf *m, u_int16_t t)
/*
* Having found a valid vlan interface corresponding to
* the given source interface and vlan tag, run the
* the real packet through ethert_input().
* the real packet through ether_input().
*/
m->m_pkthdr.rcvif = &ifv->ifv_if;
@ -437,7 +438,7 @@ vlan_input(struct ether_header *eh, struct mbuf *m)
break;
}
if (ifv != NULL || (ifv->ifv_if.if_flags & IFF_UP) == 0) {
if (ifv == NULL || (ifv->ifv_if.if_flags & IFF_UP) == 0) {
m_freem(m);
return -1; /* so ether_input can take note */
}