leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tipc: Prune unused data structures from configuration service

Browse Source 
Eliminate some unused data structures in the TIPC
configuration service that relate to the handling of link
subscriptions, which were not supported when TIPC 1.5 was
introduced.  If and when support for link subscriptions is
offered in TIPC, these elements may need to be re-introduced.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Allan Stephens 2010-05-11 14:30:05 +00:00 committed by David S. Miller
parent b82834e66a
commit 289464e4fc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/tipc/config.c
View File

@ -56,9 +56,6 @@ struct subscr_data {
struct manager { struct manager {
u32 user_ref; u32 user_ref;
u32 port_ref; u32 port_ref;
u32 subscr_ref;
u32 link_subscriptions;
struct list_head link_subscribers;
}; };
static struct manager mng = { 0}; static struct manager mng = { 0};
@ -70,12 +67,6 @@ static int req_tlv_space; /* request message TLV area size */
static int rep_headroom; /* reply message headroom to use */ static int rep_headroom; /* reply message headroom to use */
void tipc_cfg_link_event(u32 addr, char *name, int up)
{
/* TIPC DOESN'T HANDLE LINK EVENT SUBSCRIPTIONS AT THE MOMENT */
}
struct sk_buff *tipc_cfg_reply_alloc(int payload_size) struct sk_buff *tipc_cfg_reply_alloc(int payload_size)
{ {
struct sk_buff *buf; struct sk_buff *buf;
@ -130,12 +121,24 @@ struct sk_buff *tipc_cfg_reply_string_type(u16 tlv_type, char *string)
} }
#if 0 #if 0
/* Now obsolete code for handling commands not yet implemented the new way */ /* Now obsolete code for handling commands not yet implemented the new way */
/*
* Some of this code assumed that the manager structure contains two added
* fields:
* u32 link_subscriptions;
* struct list_head link_subscribers;
* which are currently not present. These fields may need to be re-introduced
* if and when support for link subscriptions is added.
*/
void tipc_cfg_link_event(u32 addr, char *name, int up)
{
/* TIPC DOESN'T HANDLE LINK EVENT SUBSCRIPTIONS AT THE MOMENT */
}
int tipc_cfg_cmd(const struct tipc_cmd_msg * msg, int tipc_cfg_cmd(const struct tipc_cmd_msg * msg,
char *data, char *data,
u32 sz, u32 sz,
@ -667,9 +670,6 @@ int tipc_cfg_init(void)
struct tipc_name_seq seq; struct tipc_name_seq seq;
int res; int res;
memset(&mng, 0, sizeof(mng));
INIT_LIST_HEAD(&mng.link_subscribers);
res = tipc_attach(&mng.user_ref, NULL, NULL); res = tipc_attach(&mng.user_ref, NULL, NULL);
if (res) if (res)
goto failed; goto failed;