From patchwork Thu Oct  1 14:40:09 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: 50971
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 n91EeCK7016255
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 1 Oct 2009 14:40:13 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932621AbZJAOkH (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Thu, 1 Oct 2009 10:40:07 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932575AbZJAOkH
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Thu, 1 Oct 2009 10:40:07 -0400
Received: from mail-ew0-f211.google.com ([209.85.219.211]:63521 "EHLO
	mail-ew0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932456AbZJAOkG convert rfc822-to-8bit (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Thu, 1 Oct 2009 10:40:06 -0400
Received: by ewy7 with SMTP id 7so246219ewy.17
	for <linux-wireless@vger.kernel.org>;
	Thu, 01 Oct 2009 07:40:09 -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
	:content-transfer-encoding;
	bh=Jk/JeyKB30dLjc1K4S9dIinIjz42/3OuT2subb7vv4w=;
	b=utBSJnXEt2xfFsUMEGecmg2+sBs1bG0uOVc+hpbaevL4csQ5mTNqd/9jj6IAgIaerg
	n9BkdZ+19trHiLIDefd9kablfy40NzQ5dEOfYBBe02ScH2cKUbRoe+5hQlem3r6wfh23
	FMjjM6Y5inhHRXwJsnABkZzRQD4REyubkguPk=
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:content-transfer-encoding;
	b=Hu5iNrKI29Sy225UoTmEFVYLi55XCFrqIOiUr3HDxVkPYaAlFaL57ndqO8f37n2tjf
	ctJH43QqbNZcUEl9BqlTH/tlsrE56msp6alhuZYVmwdHpGJ8AoMicNToYpGm0awxoQI1
	bHliAukEsq8RWE9AScyFc+zkcrkI8xEP32d7Q=
MIME-Version: 1.0
Received: by 10.216.20.1 with SMTP id o1mr275423weo.10.1254408009264;
	Thu, 01 Oct 2009 07:40:09 -0700 (PDT)
In-Reply-To: <57b62e7d0910010732m38ab57k916662f9047fcc91@mail.gmail.com>
References: <57b62e7d0909291754x352ae254sa33ee7efb430d497@mail.gmail.com>
	<1254341787.3959.11.camel@johannes.local>
	<57b62e7d0910010732m38ab57k916662f9047fcc91@mail.gmail.com>
Date: Thu, 1 Oct 2009 16:40:09 +0200
Message-ID: <57b62e7d0910010740t67a96d88h59b10161844f2836@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:24:34.000000000 +0200
+++ b/net/mac80211/sta_info.c	2009-10-01 16:27:31.000000000 +0200
@@ -498,7 +498,7 @@ static void __sta_info_unlink(struct sta
 			       &(*sta)->sta);
 	}

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