Module Name: src
Committed By: matt
Date: Fri Sep 5 05:33:06 UTC 2014
Modified Files:
src/sys/netinet6: frag6.c
Log Message:
Don't use new as a variable name.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/netinet6/frag6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.55 src/sys/netinet6/frag6.c:1.56
--- src/sys/netinet6/frag6.c:1.55 Fri Aug 30 07:42:08 2013
+++ src/sys/netinet6/frag6.c Fri Sep 5 05:33:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.55 2013/08/30 07:42:08 christos Exp $ */
+/* $NetBSD: frag6.c,v 1.56 2014/09/05 05:33:06 matt Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55 2013/08/30 07:42:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.56 2014/09/05 05:33:06 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -568,15 +568,15 @@ frag6_deq(struct ip6asfrag *af6)
}
void
-frag6_insque(struct ip6q *new, struct ip6q *old)
+frag6_insque(struct ip6q *newq, struct ip6q *oldq)
{
KASSERT(mutex_owned(&frag6_lock));
- new->ip6q_prev = old;
- new->ip6q_next = old->ip6q_next;
- old->ip6q_next->ip6q_prev= new;
- old->ip6q_next = new;
+ newq->ip6q_prev = oldq;
+ newq->ip6q_next = oldq->ip6q_next;
+ oldq->ip6q_next->ip6q_prev= newq;
+ oldq->ip6q_next = newq;
}
void