From: dlg <dlg@openbsd.org>
Date: Mon, 12 Oct 2015 13:17:58 +0000 (+0000)
Subject: the pattr argument to IFQ_ENQUEUE is unused, so let's get rid of it.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=22e164c3884bf7aed812e1c3d2a7b4125530f32f;p=openbsd

the pattr argument to IFQ_ENQUEUE is unused, so let's get rid of it.

also the comment above IFQ_ENQUEUE that says the pattr argument is unused.

ok mpi@
---

diff --git a/sys/net/if.c b/sys/net/if.c
index 0399b0dd3d4..23f79b01fef 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.388 2015/10/12 11:32:39 mpi Exp $	*/
+/*	$OpenBSD: if.c,v 1.389 2015/10/12 13:17:58 dlg Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -574,7 +574,7 @@ if_enqueue(struct ifnet *ifp, struct mbuf *m)
 	 * Queue message on interface, and start output if interface
 	 * not yet active.
 	 */
-	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, error);
 	if (error) {
 		splx(s);
 		return (error);
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 6f11546a29d..4c85df2ab51 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.89 2015/10/05 19:05:09 uebayasi Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.90 2015/10/12 13:17:58 dlg Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -804,7 +804,7 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 		error = 0;
 	    }
 	} else
-	    IFQ_ENQUEUE(&sc->sc_if.if_snd, m0, NULL, error);
+	    IFQ_ENQUEUE(&sc->sc_if.if_snd, m0, error);
 	if (error) {
 	    splx(s);
 	    sc->sc_if.if_oerrors++;
@@ -867,7 +867,7 @@ ppp_requeue(struct ppp_softc *sc)
 		    error = 0;
 		}
 	    } else
-		IFQ_ENQUEUE(&sc->sc_if.if_snd, m, NULL, error);
+		IFQ_ENQUEUE(&sc->sc_if.if_snd, m, error);
 	    if (error) {
 		sc->sc_if.if_oerrors++;
 		sc->sc_stats.ppp_oerrors++;
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index a086449ba09..a58be229d48 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_var.h,v 1.47 2015/10/05 15:19:29 uebayasi Exp $	*/
+/*	$OpenBSD: if_var.h,v 1.48 2015/10/12 13:17:58 dlg Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -324,8 +324,7 @@ do {									\
 #define	IF_LEN(ifq)		((ifq)->ifq_len)
 #define	IF_IS_EMPTY(ifq)	((ifq)->ifq_len == 0)
 
-/* XXX pattr unused */
-#define	IFQ_ENQUEUE(ifq, m, pattr, err)					\
+#define	IFQ_ENQUEUE(ifq, m, err)					\
 do {									\
 	if (HFSC_ENABLED(ifq))						\
 		(err) = hfsc_enqueue(((struct ifqueue *)(ifq)), m);	\
diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index eb293610247..04c165a01f8 100644
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_pae_output.c,v 1.23 2015/10/05 19:05:09 uebayasi Exp $	*/
+/*	$OpenBSD: ieee80211_pae_output.c,v 1.24 2015/10/12 13:17:58 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -126,7 +126,7 @@ ieee80211_send_eapol_key(struct ieee80211com *ic, struct mbuf *m,
 	if (info & EAPOL_KEY_KEYACK)
 		timeout_add_msec(&ni->ni_eapol_to, 100);
 #endif
-	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, error);
 	if (error == 0) {
 		ifp->if_obytes += len;
 		if ((ifp->if_flags & IFF_OACTIVE) == 0)