From owner-svn-src-all@freebsd.org  Tue Feb 23 21:11:43 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E26EAB2634;
 Tue, 23 Feb 2016 21:11:43 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6102D1637;
 Tue, 23 Feb 2016 21:11:43 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1NLBggW037392;
 Tue, 23 Feb 2016 21:11:42 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1NLBg22037391;
 Tue, 23 Feb 2016 21:11:42 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201602232111.u1NLBg22037391@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Tue, 23 Feb 2016 21:11:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295932 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Feb 2016 21:11:43 -0000

Author: avos
Date: Tue Feb 23 21:11:42 2016
New Revision: 295932
URL: https://svnweb.freebsd.org/changeset/base/295932

Log:
  net80211: fix TIM cleanup.
  
  Remove duplicate 'ni->ni_associd = 0' assignment from
  ieee80211_node_leave(), since it breaks iv_set_tim() in
  ic->ic_node_cleanup() (associd is cleared right after this call).
  
  Tested with RTL8188EU (HOSTAP mode) and
  WUSB54GC (STA mode, with powersaving enabled).
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5398

Modified:
  head/sys/net80211/ieee80211_node.c

Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c	Tue Feb 23 20:00:55 2016	(r295931)
+++ head/sys/net80211/ieee80211_node.c	Tue Feb 23 21:11:42 2016	(r295932)
@@ -2683,7 +2683,6 @@ ieee80211_node_leave(struct ieee80211_no
 
 	IEEE80211_LOCK(ic);
 	IEEE80211_AID_CLR(vap, ni->ni_associd);
-	ni->ni_associd = 0;
 	vap->iv_sta_assoc--;
 	ic->ic_sta_assoc--;