From patchwork Wed Jan 14 02:23:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 5625331 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C1585C058D for ; Wed, 14 Jan 2015 02:24:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFD0820212 for ; Wed, 14 Jan 2015 02:23:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24E7520211 for ; Wed, 14 Jan 2015 02:23:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751546AbbANCX5 (ORCPT ); Tue, 13 Jan 2015 21:23:57 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:36543 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbbANCX4 (ORCPT ); Tue, 13 Jan 2015 21:23:56 -0500 Received: by mail-pd0-f179.google.com with SMTP id fp1so6834247pdb.10 for ; Tue, 13 Jan 2015 18:23:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=T+vazR24A6fzHlxWCKo+xlP/TvgtEebYtlii3Wl5h/8=; b=h5P4bCmfqqBGYvacp3/+OL3xfbhfohdW0GihFB3ioO8HdeI4pFxziku1qPPepiZSI6 P+C44GWA4m90w+0qV0LhBJsd+KDKeXKJ3VHscWvv0/12K+JWFvJAgrbV8I8H81y8pNVU EFtEiC+F7VSoqSjaci65Yod5EIOHS1JHO1IiNC9/QWQDFxMCqKFEgXknxyOcN0d9Ix2M RwhNm+uheiZ1j99m4NdD2ulJd1gBkXeam0SSMxevkgRKghP8Z9ZueOR2jKBM+2K3h0xV VZYOZ5MA3UifeB6/6r273BKhj0TkXNxQiHCY5GRw2uNovJ8yPHKWiXloFPqpsxeddhCZ UrpQ== X-Received: by 10.66.66.102 with SMTP id e6mr2222605pat.6.1421202236404; Tue, 13 Jan 2015 18:23:56 -0800 (PST) Received: from localhost.localdomain (p7bc67131.kngwnt01.ap.so-net.ne.jp. [123.198.113.49]) by mx.google.com with ESMTPSA id e5sm18206819pdh.59.2015.01.13.18.23.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jan 2015 18:23:55 -0800 (PST) From: Masashi Honma To: linux-wireless@vger.kernel.org Cc: me@bobcopeland.com, Masashi Honma Subject: [PATCH] mesh: Skip STA expiration on user_mpm mode Date: Wed, 14 Jan 2015 11:23:09 +0900 Message-Id: <1421202189-4020-1-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mesh STA expiration processing works even if user_mpm mode. This causes unexpected STA disconnection. This patch skips STA expiration processing on user_mpm mode. Signed-off-by: Masashi Honma --- net/mac80211/mesh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 0c8b2a7..50174fd 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -574,7 +574,8 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata) struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; u32 changed; - ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ); + if (!ifmsh->user_mpm) + ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ); mesh_path_expire(sdata); changed = mesh_accept_plinks_update(sdata);