On Thu, Dec 03, 2015 at 06:48:28AM -0500, Ted Unangst wrote: > Cleaner this way I think.
Yes, OK bluhm@ > > > Index: frag6.c > =================================================================== > RCS file: /cvs/src/sys/netinet6/frag6.c,v > retrieving revision 1.65 > diff -u -p -r1.65 frag6.c > --- frag6.c 22 Oct 2015 10:22:53 -0000 1.65 > +++ frag6.c 3 Dec 2015 11:44:10 -0000 > @@ -215,9 +215,7 @@ frag6_input(struct mbuf **mp, int *offp, > * If maxfrag is 0, never accept fragments. > * If maxfrag is -1, accept all fragments without limitation. > */ > - if (ip6_maxfrags < 0) > - ; > - else if (frag6_nfrags >= (u_int)ip6_maxfrags) > + if (ip6_maxfrags >= 0 && frag6_nfrags >= (u_int)ip6_maxfrags) > goto dropfrag; > > TAILQ_FOREACH(q6, &frag6_queue, ip6q_queue) > @@ -239,9 +237,8 @@ frag6_input(struct mbuf **mp, int *offp, > * If maxfragpackets is -1, accept all fragments without > * limitation. > */ > - if (ip6_maxfragpackets < 0) > - ; > - else if (frag6_nfragpackets >= (u_int)ip6_maxfragpackets) > + if (ip6_maxfragpackets >= 0 && > + frag6_nfragpackets >= (u_int)ip6_maxfragpackets) > goto dropfrag; > frag6_nfragpackets++; > q6 = malloc(sizeof(*q6), M_FTABLE, M_NOWAIT | M_ZERO);
