From owner-p4-projects@FreeBSD.ORG Wed Oct 13 21:40:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 716821065693; Wed, 13 Oct 2010 21:40:11 +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 337DF10656B7 for ; Wed, 13 Oct 2010 21:40:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 05C968FC19 for ; Wed, 13 Oct 2010 21:40:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9DLeAUU005449 for ; Wed, 13 Oct 2010 21:40:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9DLeAN0005446 for perforce@freebsd.org; Wed, 13 Oct 2010 21:40:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Oct 2010 21:40:10 GMT Message-Id: <201010132140.o9DLeAN0005446@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 21:40:11 -0000 http://p4web.freebsd.org/@@184689?ac=10 Change 184689 by hselasky@hselasky_laptop001 on 2010/10/13 21:40:07 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 (text+ko) ==== @@ -696,7 +696,6 @@ ieee80211_state_name[nstate]); IEEE80211_UNLOCK(ic); - RAL_LOCK(sc); usb_callout_stop(&uvp->ratectl_ch); @@ -728,18 +727,18 @@ if (m == NULL) { device_printf(sc->sc_dev, "could not allocate beacon\n"); - ieee80211_free_node(ni); RAL_UNLOCK(sc); IEEE80211_LOCK(ic); + ieee80211_free_node(ni); return (-1); } ieee80211_ref_node(ni); if (ural_tx_bcn(sc, m, ni) != 0) { device_printf(sc->sc_dev, "could not send beacon\n"); - ieee80211_free_node(ni); RAL_UNLOCK(sc); IEEE80211_LOCK(ic); + ieee80211_free_node(ni); return (-1); } } @@ -2255,10 +2254,8 @@ sum = ok+fail; retrycnt = sc->sta[8] + fail; - ni = ieee80211_ref_node(vap->iv_bss); ieee80211_ratectl_tx_update(vap, ni, &sum, &ok, &retrycnt); (void) ieee80211_ratectl_rate(ni, NULL, 0); - ieee80211_free_node(ni); ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 (text+ko) ==== @@ -1843,7 +1843,6 @@ sc->sc_state = nstate; IEEE80211_UNLOCK(ic); - URTW_LOCK(sc); usb_callout_stop(&sc->sc_led_ch); callout_stop(&sc->sc_watchdog_ch); @@ -1856,7 +1855,6 @@ break; case IEEE80211_S_RUN: ni = ieee80211_ref_node(vap->iv_bss); - /* setting bssid. */ urtw_write32_m(sc, URTW_BSSID, ((uint32_t *)ni->ni_bssid)[0]); urtw_write16_m(sc, URTW_BSSID + 4, @@ -1871,7 +1869,6 @@ if (error != 0) device_printf(sc->sc_dev, "could not control LED (%d)\n", error); - ieee80211_free_node(ni); break; default: