From patchwork Sun Oct 11 09:47:57 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Berg <johannes@sipsolutions.net>
X-Patchwork-Id: 52992
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9B9mlW9024798
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sun, 11 Oct 2009 09:48:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755625AbZJKJsg (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sun, 11 Oct 2009 05:48:36 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755693AbZJKJsg
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Sun, 11 Oct 2009 05:48:36 -0400
Received: from xc.sipsolutions.net ([83.246.72.84]:59225 "EHLO
	sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755587AbZJKJsf (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Sun, 11 Oct 2009 05:48:35 -0400
Received: by sipsolutions.net with esmtpsa
	(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69)
	(envelope-from <johannes@sipsolutions.net>)
	id 1Mwv1y-0005P3-Jy; Sun, 11 Oct 2009 11:47:58 +0200
Subject: [PATCH] mac80211: fix ibss race
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: Felix Fietkau <nbd@openwrt.org>,
	linux-wireless <linux-wireless@vger.kernel.org>
Date: Sun, 11 Oct 2009 11:47:57 +0200
Message-Id: <1255254477.4095.45.camel@johannes.local>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.0 
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


--- wireless-testing.orig/net/mac80211/ibss.c	2009-10-02 10:41:44.000000000 +0200
+++ wireless-testing/net/mac80211/ibss.c	2009-10-06 14:57:27.000000000 +0200
@@ -831,7 +831,7 @@ void ieee80211_ibss_notify_scan_complete
 		if (!sdata->u.ibss.ssid_len)
 			continue;
 		sdata->u.ibss.last_scan_completed = jiffies;
-		ieee80211_sta_find_ibss(sdata);
+		mod_timer(&sdata->u.ibss.timer, 0);
 	}
 	mutex_unlock(&local->iflist_mtx);
 }