From owner-p4-projects@FreeBSD.ORG  Thu Oct 14 22:32:22 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78DA51065673; Thu, 14 Oct 2010 22:32:22 +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 3BB5B106566C
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:32:22 +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 2802F8FC16
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:32:22 +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 o9EMWMPo017772
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:32:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMWMZe017769
	for perforce@freebsd.org; Thu, 14 Oct 2010 22:32:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 14 Oct 2010 22:32:22 GMT
Message-Id: <201010142232.o9EMWMZe017769@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 184746 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Oct 2010 22:32:22 -0000

http://p4web.freebsd.org/@@184746?ac=10

Change 184746 by hselasky@hselasky_laptop001 on 2010/10/14 22:31:31

	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#36 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#36 (text+ko) ====

@@ -708,7 +708,6 @@
 		ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
-
 	RUM_LOCK(sc);
 	usb_callout_stop(&rvp->ratectl_ch);
 
@@ -746,7 +745,6 @@
 		tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
 		if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
 			rum_ratectl_start(sc, ni);
-
 		ieee80211_free_node(ni);
 		break;
 	default: