From patchwork Thu Oct  1 14:32:46 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?b?Qmxhw4XCviBCYcOEwo1uaWs=?= <bacnik@gmail.com>
X-Patchwork-Id: 50969
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 n91EWn6s014842
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 1 Oct 2009 14:32:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932653AbZJAOco (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Thu, 1 Oct 2009 10:32:44 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932605AbZJAOco
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Thu, 1 Oct 2009 10:32:44 -0400
Received: from mail-ew0-f211.google.com ([209.85.219.211]:63475 "EHLO
	mail-ew0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932600AbZJAOcn (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Thu, 1 Oct 2009 10:32:43 -0400
Received: by ewy7 with SMTP id 7so237690ewy.17
	for <linux-wireless@vger.kernel.org>;
	Thu, 01 Oct 2009 07:32:46 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:in-reply-to:references
	:date:message-id:subject:from:to:cc:content-type;
	bh=FSmu76jIs/BdIiV9bg4rsZNL6Ukl/eApfPh5NhZ1pzQ=;
	b=VjMh1qVBSTrZSt31/+aCln99X27+FBz1bRDmU5LSNnS1kA6k/FUl8U71u4AsdnFjOo
	5UfEBL+5/f+AwQxwGPr+Tu4sQZTZbaVJBS1+ZgcKMG5dOI/NFUHDM9YMADlePwvNejJh
	P4RXvtKLTZp8Lcg72sHZw+/Yr7DsXfdKn/KWE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type;
	b=Wb9mEwD3oCgLjvlhM8+WDM4/wdyNBABRRYK9m1O9bNdDQaZAxwbn4L9D0yKRAjUfjs
	czz7SzSkDFTCQcB5Ad1k8c7t2iPlTC23pxnXW5qTo6zrdCbo/ubr34dDtTO9/6RhcNPk
	XmFx4PgsnY4QRaxVFgcyLimpn4kU+4d4yEGxk=
MIME-Version: 1.0
Received: by 10.216.53.65 with SMTP id f43mr306465wec.145.1254407566590;
	Thu, 01 Oct 2009 07:32:46 -0700 (PDT)
In-Reply-To: <1254341787.3959.11.camel@johannes.local>
References: <57b62e7d0909291754x352ae254sa33ee7efb430d497@mail.gmail.com>
	<1254341787.3959.11.camel@johannes.local>
Date: Thu, 1 Oct 2009 16:32:46 +0200
Message-ID: <57b62e7d0910010732m38ab57k916662f9047fcc91@mail.gmail.com>
Subject: Re: VLAN traffic appearing on the wrong iface
From: =?UTF-8?B?Qmxhxb4gQmHEjW5paw==?= <bacnik@gmail.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


--- a/net/mac80211/sta_info.c	2009-10-01 16:27:31.000000000 +0200
+++ b/net/mac80211/sta_info.c	2009-10-01 16:24:34.000000000 +0200
@@ -498,7 +498,7 @@ static void __sta_info_unlink(struct sta
 			       &(*sta)->sta);
 	}

-	if (ieee80211_vif_is_mesh(&(*sta)->sdata->vif)) {
+	if (ieee80211_vif_is_mesh(&sdata->vif)) {
 		mesh_accept_plinks_update(sdata);
 #ifdef CONFIG_MAC80211_MESH
 		del_timer(&(*sta)->plink_timer);