Skip to content

Commit

Permalink
tipc: remove remnants of old broadcast code
Browse files Browse the repository at this point in the history
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 <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Paul Maloy authored and David S. Miller committed Apr 13, 2016
1 parent b30d27f commit 7d45a04
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions net/tipc/bearer.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
#include <net/genetlink.h>

#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
Expand All @@ -61,16 +59,6 @@
#define TIPC_MEDIA_TYPE_IB 2
#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)
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down

0 comments on commit 7d45a04

Please sign in to comment.