Rename _rxfilter functions to _iff for consistency. From Brad, ok kevlo@

4 files changed, 24 insertions, 20 deletions

diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index a0b51596af4..a349efcc6ca 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.7 2009/09/13 14:42:52 krw Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.8 2010/01/07 12:26:06 sthen Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -116,7 +116,7 @@ void	age_stats_update(struct age_softc *);
 void	age_stop_txmac(struct age_softc *);
 void	age_stop_rxmac(struct age_softc *);
 void	age_rxvlan(struct age_softc *sc);
-void	age_rxfilter(struct age_softc *);
+void	age_iff(struct age_softc *);
 
 const struct pci_matchid age_devices[] = {
 	{ PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_L1 }
@@ -1100,7 +1100,7 @@ age_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	if (error == ENETRESET) {
 		if (ifp->if_flags & IFF_RUNNING)
-			age_rxfilter(sc);
+			age_iff(sc);
 		error = 0;
 	}
 
@@ -1808,7 +1808,8 @@ age_init(struct ifnet *ifp)
 	    MAC_CFG_PREAMBLE_MASK));
 
 	/* Set up the receive filter. */
-	age_rxfilter(sc);
+	age_iff(sc);
+
 	age_rxvlan(sc);
 
 	reg = CSR_READ_4(sc, AGE_MAC_CFG);
@@ -2211,7 +2212,7 @@ age_rxvlan(struct age_softc *sc)
 }
 
 void
-age_rxfilter(struct age_softc *sc)
+age_iff(struct age_softc *sc)
 {
 	struct arpcom *ac = &sc->sc_arpcom;
 	struct ifnet *ifp = &ac->ac_if;
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index d1987c050fd..11a31b5ab46 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.2 2009/09/13 14:42:52 krw Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.3 2010/01/07 12:26:06 sthen Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -110,7 +110,7 @@ void	alc_phy_reset(struct alc_softc *);
 void	alc_reset(struct alc_softc *);
 void	alc_rxeof(struct alc_softc *, struct rx_rdesc *);
 int	alc_rxintr(struct alc_softc *);
-void	alc_rxfilter(struct alc_softc *);
+void	alc_iff(struct alc_softc *);
 void	alc_rxvlan(struct alc_softc *);
 void	alc_start_queue(struct alc_softc *);
 void	alc_stats_clear(struct alc_softc *);
@@ -1231,7 +1231,7 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	if (error == ENETRESET) {
 		if (ifp->if_flags & IFF_RUNNING)
-			alc_rxfilter(sc);
+			alc_iff(sc);
 		error = 0;
 	}
 
@@ -2072,7 +2072,8 @@ alc_init(struct ifnet *ifp)
 	CSR_WRITE_4(sc, ALC_MAC_CFG, reg);
 
 	/* Set up the receive filter. */
-	alc_rxfilter(sc);
+	alc_iff(sc);
+
 	alc_rxvlan(sc);
 
 	/* Acknowledge all pending interrupts and clear it. */
@@ -2335,7 +2336,7 @@ alc_rxvlan(struct alc_softc *sc)
 }
 
 void
-alc_rxfilter(struct alc_softc *sc)
+alc_iff(struct alc_softc *sc)
 {
 	struct arpcom *ac = &sc->sc_arpcom;
 	struct ifnet *ifp = &ac->ac_if;
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index abf811510d1..d1896e6ce4f 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.9 2009/09/13 14:42:52 krw Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.10 2010/01/07 12:26:06 sthen Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -113,7 +113,7 @@ void	ale_get_macaddr(struct ale_softc *);
 void	ale_mac_config(struct ale_softc *);
 void	ale_phy_reset(struct ale_softc *);
 void	ale_reset(struct ale_softc *);
-void	ale_rxfilter(struct ale_softc *);
+void	ale_iff(struct ale_softc *);
 void	ale_rxvlan(struct ale_softc *);
 void	ale_stats_clear(struct ale_softc *);
 void	ale_stats_update(struct ale_softc *);
@@ -1117,7 +1117,7 @@ ale_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	if (error == ENETRESET) {
 		if (ifp->if_flags & IFF_RUNNING)
-			ale_rxfilter(sc);
+			ale_iff(sc);
 		error = 0;
 	}
 
@@ -1835,7 +1835,8 @@ ale_init(struct ifnet *ifp)
 	CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
 
 	/* Set up the receive filter. */
-	ale_rxfilter(sc);
+	ale_iff(sc);
+
 	ale_rxvlan(sc);
 
 	/* Acknowledge all pending interrupts and clear it. */
@@ -1993,7 +1994,7 @@ ale_rxvlan(struct ale_softc *sc)
 }
 
 void
-ale_rxfilter(struct ale_softc *sc)
+ale_iff(struct ale_softc *sc)
 {
 	struct arpcom *ac = &sc->sc_arpcom;
 	struct ifnet *ifp = &ac->ac_if;
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 57a2d3a7765..af3a404fff2 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.20 2009/09/13 14:42:52 krw Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.21 2010/01/07 12:26:06 sthen Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -112,7 +112,7 @@ void	jme_tick(void *);
 void	jme_stop(struct jme_softc *);
 void	jme_reset(struct jme_softc *);
 void	jme_set_vlan(struct jme_softc *);
-void	jme_set_filter(struct jme_softc *);
+void	jme_iff(struct jme_softc *);
 void	jme_stop_tx(struct jme_softc *);
 void	jme_stop_rx(struct jme_softc *);
 void	jme_mac_config(struct jme_softc *);
@@ -1311,7 +1311,7 @@ jme_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	if (error == ENETRESET) {
 		if (ifp->if_flags & IFF_RUNNING)
-			jme_set_filter(sc);
+			jme_iff(sc);
 		error = 0;
 	}
 
@@ -1900,7 +1900,8 @@ jme_init(struct ifnet *ifp)
 	CSR_WRITE_4(sc, JME_RXMAC, 0);
 
 	/* Set up the receive filter. */
-	jme_set_filter(sc);
+	jme_iff(sc);
+
 	jme_set_vlan(sc);
 
 	/*
@@ -2260,7 +2261,7 @@ jme_set_vlan(struct jme_softc *sc)
 }
 
 void
-jme_set_filter(struct jme_softc *sc)
+jme_iff(struct jme_softc *sc)
 {
 	struct arpcom *ac = &sc->sc_arpcom;
 	struct ifnet *ifp = &ac->ac_if;