From patchwork Wed Dec 15 06:27:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shan Wei X-Patchwork-Id: 75611 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ADB431007D6 for ; Wed, 15 Dec 2010 17:29:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752975Ab0LOG3U (ORCPT ); Wed, 15 Dec 2010 01:29:20 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:60155 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752886Ab0LOG3S (ORCPT ); Wed, 15 Dec 2010 01:29:18 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 1434A170749; Wed, 15 Dec 2010 14:29:16 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id oBF6OR9h004247; Wed, 15 Dec 2010 14:24:27 +0800 Received: from [10.167.225.31] ([10.167.225.31]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2010121514291541-239376 ; Wed, 15 Dec 2010 14:29:15 +0800 Message-ID: <4D085FD0.4020804@cn.fujitsu.com> Date: Wed, 15 Dec 2010 14:27:28 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13pre) Gecko/20101113 Shredder/3.1.7pre MIME-Version: 1.0 To: johannes@sipsolutions.net, linville@tuxdriver.com, David Miller CC: linux-wireless@vger.kernel.org, Network-Maillist Subject: [PATCH 3/3] wireless:mac80211: kill unuse macro MESH_CFG_CMP_LEN in mesh.h X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-15 14:29:15, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-15 14:29:15, Serialize complete at 2010-12-15 14:29:15 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 00d3f14c has removed the references of this macro, but left it only. So remove this definition. commit 00d3f14cf9f12c21428121026a5e1d5f65926447 Author: Johannes Berg Date: Tue Feb 10 21:26:00 2009 +0100 mac80211: use cfg80211s BSS infrastructure Remove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely. Signed-off-by: Shan Wei --- net/mac80211/mesh.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 58e7411..8111c64 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -163,18 +163,6 @@ struct mesh_rmc { u32 idx_mask; }; - -/* - * MESH_CFG_COMP_LEN Includes: - * - Active path selection protocol ID. - * - Active path selection metric ID. - * - Congestion control mode identifier. - * - Channel precedence. - * Does not include mesh capabilities, which may vary across nodes in the same - * mesh - */ -#define MESH_CFG_CMP_LEN (IEEE80211_MESH_CONFIG_LEN - 2) - /* Default values, timeouts in ms */ #define MESH_TTL 31 #define MESH_MAX_RETR 3