From patchwork Wed Apr 13 15:45:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Maloy X-Patchwork-Id: 610070 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 3qlSnb0BB9z9t5w for ; Thu, 14 Apr 2016 01:45:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yahoo.com header.i=@yahoo.com header.b=M3AFkHpJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752774AbcDMPpx (ORCPT ); Wed, 13 Apr 2016 11:45:53 -0400 Received: from smtp103.biz.mail.bf1.yahoo.com ([98.139.221.62]:32873 "EHLO smtp103.biz.mail.bf1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752575AbcDMPpw (ORCPT ); Wed, 13 Apr 2016 11:45:52 -0400 Received: (qmail 44117 invoked from network); 13 Apr 2016 15:45:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1460562351; bh=7cx91E8ovrxiMFrqnu7iWLWr2zAVqhVEbeJcujDvh5Y=; h=From:To:Cc:Subject:Date:Message-Id; b=M3AFkHpJfTb0d+4SgtWQ/OebnZckoKd6ypNkxCuLkuIhapo5syotwKrCEIJSpoe5YfdMgxAu0vVzRvnhL7dDUX3wgCbjciYjZBh2JmKms1/gj06oKKEYmmpL5L7RpKBUEUFXAXdCktbEs9+uKzJ5VhsthYD4gKAQk5t7PAe1WBE= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: ko.SAgsVM1ngNmDrSEBAjUOfP7aaz6RtXi8aRUDmcWkun_g _SOBDnEkqNsCN7FaoQ3ffQ_WQfHOM6M0me_N26QVtllYt1VWH2s5C7zt9bz3 omY4g8VDbwDbaZoD06GO7fLXn129P7tPWBQ.DWAMR7pKsRW3iL32cKR8zu5R phjIKT8KO2GKzc7CQgJfFhaG0KPeM8nidDFgzpn6dgjS2uPHL_FXHn.r2aDt HjmFfrn_5MrnrPf7UviAjliTcf2KgAxSZYoFgkZCnZ13uY7GtX24GoVrJbDA CGDd8wVUFg1i7Wq6GUfaF_fdcrli8zhOOKvbn7HcjeaSZRxiUCLHs6CLpyaT fzIbxTQSiwvciKXK3yfg6VALHZG.X5WlZJWrrGGlZRxbY_2PLGwIKROCJ4od EBR__w0HI_COcAxr.e7PS4dRj2A5DypIHDYv3qEoObxSGbEkx7uzbPIVuSr5 2Oi3YxjIvLm.1IZQU61SJw3YcYeV3DZ09ryFMJvBa3ome5hk0RfjprnQT1xx O6leFJYutM7midPjW6osEr8AXpcKanFfB4Q-- X-Yahoo-SMTP: gPXIZm2swBAFQJ_Vx0CebjUfUdhJ From: Jon Maloy To: davem@davemloft.net Cc: netdev@vger.kernel.org, Paul Gortmaker , parthasarathy.bhuvaragan@ericsson.com, richard.alpe@ericsson.com, ying.xue@windriver.com, maloy@donjonn.com, tipc-discussion@lists.sourceforge.net, Jon Maloy Subject: [PATCH net-next 1/1] tipc: remove remnants of old broadcast code Date: Wed, 13 Apr 2016 11:45:47 -0400 Message-Id: <1460562347-26436-1-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We remove a couple of leftover fields in struct tipc_bearer. Those were used by the old broadcast implementation, and are not needed any longer. There is no functional changes in this commit. Acked-by: Ying Xue Signed-off-by: Jon Maloy --- net/tipc/bearer.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index e318205..f686e41 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -42,8 +42,6 @@ #include #define MAX_MEDIA 3 -#define MAX_NODES 4096 -#define WSIZE 32 /* Identifiers associated with TIPC message header media address info * - address info field is 32 bytes long @@ -62,16 +60,6 @@ #define TIPC_MEDIA_TYPE_UDP 3 /** - * struct tipc_node_map - set of node identifiers - * @count: # of nodes in set - * @map: bitmap of node identifiers that are in the set - */ -struct tipc_node_map { - u32 count; - u32 map[MAX_NODES / WSIZE]; -}; - -/** * struct tipc_media_addr - destination address used by TIPC bearers * @value: address info (format defined by media) * @media_id: TIPC media type identifier @@ -142,7 +130,6 @@ struct tipc_media { * @identity: array index of this bearer within TIPC bearer array * @link_req: ptr to (optional) structure making periodic link setup requests * @net_plane: network plane ('A' through 'H') currently associated with bearer - * @nodes: indicates which nodes in cluster can be reached through bearer * * Note: media-specific code is responsible for initialization of the fields * indicated below when a bearer is enabled; TIPC's generic bearer code takes @@ -163,8 +150,6 @@ struct tipc_bearer { u32 identity; struct tipc_link_req *link_req; char net_plane; - int node_cnt; - struct tipc_node_map nodes; }; struct tipc_bearer_names {