From 32de3ff995ca0d59f049a66f62dec50bf93a849b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 28 Aug 2008 13:10:54 +0000
Subject: [PATCH] Fix a typo in the naming of the PPPoE input queues, ppoe ->
 pppoe.

ok canacar@
---
 sys/net/if_ethersubr.c |  6 +++---
 sys/net/if_pppoe.c     | 14 +++++++-------
 sys/net/if_pppoe.h     |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index fb928093639..eb89e854ded 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.123 2008/08/04 18:55:08 damien Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.124 2008/08/28 13:10:54 brad Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -714,9 +714,9 @@ decapsulate:
 		bcopy(eh, eh_tmp, sizeof(struct ether_header));
 
 		if (etype == ETHERTYPE_PPPOEDISC)
-			inq = &ppoediscinq;
+			inq = &pppoediscinq;
 		else
-			inq = &ppoeinq;
+			inq = &pppoeinq;
 
 		schednetisr(NETISR_PPPOE);
 		break;
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index f21d2fe9361..985dfc38d5c 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.24 2008/08/27 08:41:46 brad Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.25 2008/08/28 13:10:54 brad Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -148,8 +148,8 @@ struct pppoe_softc {
 };
 
 /* incoming traffic will be queued here */
-struct ifqueue ppoediscinq = { NULL };
-struct ifqueue ppoeinq = { NULL };
+struct ifqueue pppoediscinq = { NULL };
+struct ifqueue pppoeinq = { NULL };
 
 extern int sppp_ioctl(struct ifnet *, unsigned long, void *);
 
@@ -205,8 +205,8 @@ pppoeattach(int count)
 	LIST_INIT(&pppoe_softc_list);
 	if_clone_attach(&pppoe_cloner);
 
-	ppoediscinq.ifq_maxlen = IFQ_MAXLEN;
-	ppoeinq.ifq_maxlen = IFQ_MAXLEN;
+	pppoediscinq.ifq_maxlen = IFQ_MAXLEN;
+	pppoeinq.ifq_maxlen = IFQ_MAXLEN;
 }
 
 /* Create a new interface. */
@@ -366,7 +366,7 @@ pppoeintr(void)
 	
 	for (;;) {
 		s = splnet();
-		IF_DEQUEUE(&ppoediscinq, m);
+		IF_DEQUEUE(&pppoediscinq, m);
 		splx(s);
 		if (m == NULL)
 			break;
@@ -375,7 +375,7 @@ pppoeintr(void)
 
 	for (;;) {
 		s = splnet();
-		IF_DEQUEUE(&ppoeinq, m);
+		IF_DEQUEUE(&pppoeinq, m);
 		splx(s);
 		if (m == NULL)
 			break;
diff --git a/sys/net/if_pppoe.h b/sys/net/if_pppoe.h
index 102420fc573..8251cf0f369 100644
--- a/sys/net/if_pppoe.h
+++ b/sys/net/if_pppoe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppoe.h,v 1.4 2008/06/26 05:42:20 ray Exp $ */
+/*	$OpenBSD: if_pppoe.h,v 1.5 2008/08/28 13:10:54 brad Exp $ */
 /*	$NetBSD: if_pppoe.h,v 1.5 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -66,8 +66,8 @@ struct pppoeconnectionstate {
 
 #ifdef _KERNEL
 
-extern struct ifqueue ppoediscinq;
-extern struct ifqueue ppoeinq;
+extern struct ifqueue pppoediscinq;
+extern struct ifqueue pppoeinq;
 
 void pppoeintr(void);
 
-- 
2.20.1