From owner-svn-src-all@FreeBSD.ORG Sat Apr 17 23:48:08 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36681106564A; Sat, 17 Apr 2010 23:48:08 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B4BF8FC12; Sat, 17 Apr 2010 23:48:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3HNm7kN008043; Sat, 17 Apr 2010 23:48:07 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3HNm7d6008039; Sat, 17 Apr 2010 23:48:07 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201004172348.o3HNm7d6008039@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 17 Apr 2010 23:48:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206780 - stable/8/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Apr 2010 23:48:08 -0000 Author: weongyo Date: Sat Apr 17 23:48:07 2010 New Revision: 206780 URL: http://svn.freebsd.org/changeset/base/206780 Log: MFC r205140: fixes a broken software beacon miss handler. There is a race to check vap->iv_bmiss_count == 0 in ieee80211_swbmiss because iv_swbmiss_task is enqueued by taskqueue. Reviewed by: rpaulo Modified: stable/8/sys/net80211/ieee80211_proto.c stable/8/sys/net80211/ieee80211_sta.c stable/8/sys/net80211/ieee80211_tdma.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/dev/uath/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/net80211/ieee80211_proto.c ============================================================================== --- stable/8/sys/net80211/ieee80211_proto.c Sat Apr 17 23:14:06 2010 (r206779) +++ stable/8/sys/net80211/ieee80211_proto.c Sat Apr 17 23:48:07 2010 (r206780) @@ -1432,8 +1432,6 @@ ieee80211_swbmiss(void *arg) } else if (vap->iv_swbmiss_count == 0) { if (vap->iv_bmiss != NULL) ieee80211_runtask(ic, &vap->iv_swbmiss_task); - if (vap->iv_bmiss_count == 0) /* don't re-arm timer */ - return; } else vap->iv_swbmiss_count = 0; callout_reset(&vap->iv_swbmiss, vap->iv_swbmiss_period, Modified: stable/8/sys/net80211/ieee80211_sta.c ============================================================================== --- stable/8/sys/net80211/ieee80211_sta.c Sat Apr 17 23:14:06 2010 (r206779) +++ stable/8/sys/net80211/ieee80211_sta.c Sat Apr 17 23:48:07 2010 (r206780) @@ -141,6 +141,8 @@ sta_beacon_miss(struct ieee80211vap *vap vap->iv_bss->ni_essid, vap->iv_bss->ni_esslen); return; } + + callout_stop(&vap->iv_swbmiss); vap->iv_bmiss_count = 0; vap->iv_stats.is_beacon_miss++; if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) { Modified: stable/8/sys/net80211/ieee80211_tdma.c ============================================================================== --- stable/8/sys/net80211/ieee80211_tdma.c Sat Apr 17 23:14:06 2010 (r206779) +++ stable/8/sys/net80211/ieee80211_tdma.c Sat Apr 17 23:48:07 2010 (r206780) @@ -295,6 +295,8 @@ tdma_beacon_miss(struct ieee80211vap *va "beacon miss, mode %u state %s\n", vap->iv_opmode, ieee80211_state_name[vap->iv_state]); + callout_stop(&vap->iv_swbmiss); + if (ts->tdma_peer != NULL) { /* XXX? can this be null? */ ieee80211_notify_node_leave(vap->iv_bss); ts->tdma_peer = NULL;