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

- Increment ifp->if_noproto when appropriate.

Browse Source 
- Use 'goto dropanyway' when appropriate.
- Move dropanyway label out of switch for readability.
This commit is contained in:
Matthew N. Dodd 2003-03-15 21:59:11 +00:00
parent 7194d335cf
commit 2910fe6d37
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=112289
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/net/if_iso88025subr.c
View File

@ -457,8 +457,10 @@ iso88025_input(ifp, th, m)
#ifdef IPX
case ETHERTYPE_IPX_8022: /* Thanks a bunch Novell */
if ((l->llc_control != LLC_UI) ||
(l->llc_ssap != ETHERTYPE_IPX_8022))
(l->llc_ssap != ETHERTYPE_IPX_8022)) {
ifp->if_noproto++;
goto dropanyway;
}
th->iso88025_shost[0] &= ~(TR_RII);
m_adj(m, 3);
@ -468,8 +470,10 @@ iso88025_input(ifp, th, m)
case LLC_SNAP_LSAP: {
u_int16_t type;
if ((l->llc_control != LLC_UI) ||
(l->llc_ssap != LLC_SNAP_LSAP))
(l->llc_ssap != LLC_SNAP_LSAP)) {
ifp->if_noproto++;
goto dropanyway;
}
if (l->llc_snap.org_code[0] != 0 ||
l->llc_snap.org_code[1] != 0 ||
@ -509,14 +513,15 @@ iso88025_input(ifp, th, m)
#endif /* NOT_YET */
default:
printf("iso88025_input: unexpected llc_snap ether_type 0x%02x\n", type);
m_freem(m);
return;
ifp->if_noproto++;
goto dropanyway;
}
break;
}
case LLC_ISO_LSAP:
switch (l->llc_control) {
case LLC_UI:
ifp->if_noproto++;
goto dropanyway;
break;
case LLC_XID:
@ -539,8 +544,7 @@ iso88025_input(ifp, th, m)
if (th->iso88025_shost[0] & TR_RII) { /* XXX */
printf("iso88025_input: dropping source routed LLC_TEST\n");
m_free(m);
return;
goto dropanyway;
}
l->llc_dsap = l->llc_ssap;
l->llc_ssap = c;
@ -564,20 +568,24 @@ iso88025_input(ifp, th, m)
}
default:
printf("iso88025_input: unexpected llc control 0x%02x\n", l->llc_control);
m_freem(m);
return;
ifp->if_noproto++;
goto dropanyway;
}
break;
default:
printf("iso88025_input: unknown dsap 0x%x\n", l->llc_dsap);
ifp->if_noproto++;
dropanyway:
m_freem(m);
return;
goto dropanyway;
}
netisr_dispatch(isr, m);
return;
dropanyway:
ifp->if_iqdrops++;
if (m)
m_freem(m);
return;
}
static int