From owner-p4-projects@FreeBSD.ORG Sat Mar 15 22:50:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E64F106567A; Sat, 15 Mar 2008 22:50:15 +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 4DF5C106564A for ; Sat, 15 Mar 2008 22:50:15 +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 511E18FC1E for ; Sat, 15 Mar 2008 22:50:15 +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 m2FMoF0Z086072 for ; Sat, 15 Mar 2008 22:50:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FMoFA3086070 for perforce@freebsd.org; Sat, 15 Mar 2008 22:50:15 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 22:50:15 GMT Message-Id: <200803152250.m2FMoFA3086070@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 137809 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: Sat, 15 Mar 2008 22:50:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=137809 Change 137809 by sam@sam_ebb on 2008/03/15 22:49:47 hookup to an mcast update callback now that net80211 handles the merge; add a usb task so the update can be done in a context that avoids LOR's and such (this is gross) Affected files ... .. //depot/projects/vap/sys/dev/usb/if_zyd.c#12 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#12 (text+ko) ==== @@ -204,7 +204,8 @@ static int zyd_set_bssid(struct zyd_softc *, const uint8_t *); static int zyd_switch_radio(struct zyd_softc *, int); static void zyd_set_led(struct zyd_softc *, int, int); -static void zyd_set_multi(struct zyd_softc *); +static void zyd_set_multi(void *); +static void zyd_update_mcast(struct ifnet *); static int zyd_set_rxfilter(struct zyd_softc *); static void zyd_set_chan(struct zyd_softc *, struct ieee80211_channel *); static int zyd_set_beacon_interval(struct zyd_softc *, int); @@ -334,6 +335,7 @@ usb_init_task(&sc->sc_scantask, zyd_scantask, sc); usb_init_task(&sc->sc_task, zyd_task, sc); + usb_init_task(&sc->sc_mcasttask, zyd_set_multi, sc); callout_init(&sc->sc_watchdog_ch, 0); @@ -409,6 +411,7 @@ ic->ic_vap_create = zyd_vap_create; ic->ic_vap_delete = zyd_vap_delete; + ic->ic_update_mcast = zyd_update_mcast; bpfattach(ifp, DLT_IEEE802_11_RADIO, sizeof(struct ieee80211_frame) + sizeof(sc->sc_txtap)); @@ -1706,8 +1709,9 @@ } static void -zyd_set_multi(struct zyd_softc *sc) +zyd_set_multi(void *arg) { + struct zyd_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; struct ifmultiaddr *ifma; @@ -1744,6 +1748,14 @@ zyd_write32(sc, ZYD_MAC_GHTBH, high); } +static void +zyd_update_mcast(struct ifnet *ifp) +{ + struct zyd_softc *sc = ifp->if_softc; + + usb_add_task(sc->sc_udev, &sc->sc_mcasttask, USB_TASKQ_DRIVER); +} + static int zyd_set_rxfilter(struct zyd_softc *sc) { @@ -2487,11 +2499,6 @@ } sc->sc_if_flags = ifp->if_flags; break; - case SIOCADDMULTI: - case SIOCDELMULTI: - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - zyd_set_multi(sc); - break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); ==== //depot/projects/vap/sys/dev/usb/if_zydreg.h#7 (text+ko) ==== @@ -1195,6 +1195,7 @@ #define ZYD_SCAN_START 0 #define ZYD_SCAN_END 1 #define ZYD_SET_CHANNEL 2 + struct usb_task sc_mcasttask; usbd_device_handle sc_udev; usbd_interface_handle sc_iface; int sc_flags;