From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:14:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3B3C106567D; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 965B81065678 for ; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 816878FC12 for ; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33HEKDh097005 for ; Thu, 3 Apr 2008 17:14:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33HEKav097003 for perforce@freebsd.org; Thu, 3 Apr 2008 17:14:20 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:14:20 GMT Message-Id: <200804031714.m33HEKav097003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2008 17:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=139276 Change 139276 by sam@sam_ebb on 2008/04/03 17:14:09 hookup promisc mode update callback Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#23 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#20 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#23 (text) ==== @@ -152,7 +152,7 @@ static void rt2560_set_bssid(struct rt2560_softc *, const uint8_t *); static void rt2560_set_macaddr(struct rt2560_softc *, uint8_t *); static void rt2560_get_macaddr(struct rt2560_softc *, uint8_t *); -static void rt2560_update_promisc(struct rt2560_softc *); +static void rt2560_update_promisc(struct ifnet *); static const char *rt2560_get_rf(int); static void rt2560_read_config(struct rt2560_softc *); static int rt2560_bbp_init(struct rt2560_softc *); @@ -300,6 +300,7 @@ ic->ic_newassoc = rt2560_newassoc; ic->ic_raw_xmit = rt2560_raw_xmit; ic->ic_updateslot = rt2560_update_slot; + ic->ic_update_promisc = rt2560_update_promisc; ic->ic_node_alloc = rt2560_node_alloc; ic->ic_scan_start = rt2560_scan_start; ic->ic_scan_end = rt2560_scan_end; @@ -2008,7 +2009,7 @@ if (ifp->if_flags & IFF_UP) { RAL_LOCK(sc); if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2560_update_promisc(sc); + rt2560_update_promisc(ifp); else rt2560_init(sc); RAL_UNLOCK(sc); @@ -2433,9 +2434,9 @@ } static void -rt2560_update_promisc(struct rt2560_softc *sc) +rt2560_update_promisc(struct ifnet *ifp) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct rt2560_softc *sc = ifp->if_softc; uint32_t tmp; tmp = RAL_READ(sc, RT2560_RXCSR0); ==== //depot/projects/vap/sys/dev/ral/rt2661.c#20 (text) ==== @@ -150,7 +150,7 @@ const uint8_t *); static void rt2661_set_macaddr(struct rt2661_softc *, const uint8_t *); -static void rt2661_update_promisc(struct rt2661_softc *); +static void rt2661_update_promisc(struct ifnet *); static int rt2661_wme_update(struct ieee80211com *) __unused; static void rt2661_update_slot(struct ifnet *); static const char *rt2661_get_rf(int); @@ -310,6 +310,7 @@ ic->ic_scan_end = rt2661_scan_end; ic->ic_set_channel = rt2661_set_channel; ic->ic_updateslot = rt2661_update_slot; + ic->ic_update_promisc = rt2661_update_promisc; ic->ic_raw_xmit = rt2661_raw_xmit; ic->ic_vap_create = rt2661_vap_create; @@ -1746,7 +1747,7 @@ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2661_update_promisc(sc); + rt2661_update_promisc(ifp); else rt2661_init(sc); } else { @@ -2090,9 +2091,9 @@ } static void -rt2661_update_promisc(struct rt2661_softc *sc) +rt2661_update_promisc(struct ifnet *ifp) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct rt2661_softc *sc = ifp->if_softc; uint32_t tmp; tmp = RAL_READ(sc, RT2661_TXRX_CSR0);