From patchwork Thu Dec 10 02:43:00 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Javier Cardona <javier@cozybit.com>
X-Patchwork-Id: 66167
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 nBA2i93X024234
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 10 Dec 2009 02:44:09 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758506AbZLJCnj (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 9 Dec 2009 21:43:39 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758444AbZLJCnj
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Wed, 9 Dec 2009 21:43:39 -0500
Received: from mail-yw0-f198.google.com ([209.85.211.198]:35344 "EHLO
	mail-yw0-f198.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758506AbZLJCnh (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Wed, 9 Dec 2009 21:43:37 -0500
Received: by ywh36 with SMTP id 36so7298422ywh.15
	for <linux-wireless@vger.kernel.org>;
	Wed, 09 Dec 2009 18:43:44 -0800 (PST)
Received: by 10.101.7.23 with SMTP id k23mr1303423ani.11.1260413024237;
	Wed, 09 Dec 2009 18:43:44 -0800 (PST)
Received: from localhost.localdomain
	(adsl-71-156-104-53.dsl.pltn13.sbcglobal.net [71.156.104.53])
	by mx.google.com with ESMTPS id 13sm205821gxk.1.2009.12.09.18.43.41
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 09 Dec 2009 18:43:42 -0800 (PST)
From: Javier Cardona <javier@cozybit.com>
To: linux-wireless@vger.kernel.org
Cc: Javier Cardona <javier@cozybit.com>, Andrey Yurovsky <andrey@cozybit.com>,
	stable@kernel.org, linville@tuxdriver.com, johannes@sipsolutions.net
Subject: [PATCH 1/2] mac80211: Fixed bug in mesh portal paths
Date: Wed,  9 Dec 2009 18:43:00 -0800
Message-Id: <1260412981-2982-1-git-send-email-javier@cozybit.com>
X-Mailer: git-send-email 1.6.3.3
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 8b3faa8..3d88541 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1712,7 +1712,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			mpp_path_add(proxied_addr, mpp_addr, sdata);
 		} else {
 			spin_lock_bh(&mppath->state_lock);
-			mppath->exp_time = jiffies;
 			if (compare_ether_addr(mppath->mpp, mpp_addr) != 0)
 				memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
 			spin_unlock_bh(&mppath->state_lock);