tipc: make local function static
Subsystems (3)
PATCH 1/2 tipc: make local function static
Signed-off-by Stephen Hemminger <[email protected]>
--- net/tipc/link.c | 2 +- net/tipc/link.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
net/tipc/link.c +1 -1
@@ -1169,7 +1169,7 @@ reject:/* * tipc_link_push_packet: Push one unsent packet to the media */ -u32 tipc_link_push_packet (struct tipc_link *l_ptr) +static u32 tipc_link_push_packet (struct tipc_link *l_ptr) {struct sk_buff *buf = l_ptr->first_out;u32 r_q_size = l_ptr->retransm_queue_size;
net/tipc/link.h +0 -1
@@ -221,7 +221,6 @@ void tipc_link_send_duplicate(struct tipvoid tipc_link_reset_fragments (struct tipc_link *l_ptr);int tipc_link_is_up (struct tipc_link *l_ptr);int tipc_link_is_active (struct tipc_link *l_ptr); -u32 tipc_link_push_packet (struct tipc_link *l_ptr);void tipc_link_stop (struct tipc_link *l_ptr);struct sk_buff *tipc_link_cmd_config (const void *req_tlv_area,int req_tlv_space,u16 cmd);struct sk_buff *tipc_link_cmd_show_stats (const void *req_tlv_area,int req_tlv_space);
PATCH 2/2 tipc: remove unused code
Remove dead code;
tipc_bearer_find_interface
tipc_node_redundant_links
This may break out of tree version of TIPC if there still is one. But that maybe a good thing :-)
Signed-off-by Stephen Hemminger <[email protected]>
--- net/tipc/bearer.c | 19 ------------------- net/tipc/bearer.h | 1 - net/tipc/node.c | 5 ----- net/tipc/node.h | 1 - 4 files changed, 26 deletions(-)
net/tipc/bearer.c +0 -19
@@ -185,25 +185,6 @@ struct tipc_bearer *tipc_bearer_find(con }/** -* tipc_bearer_find_interface - locates bearer object with matching interface name -*/ -struct tipc_bearer *tipc_bearer_find_interface (const char *if_name) -{ -struct tipc_bearer *b_ptr; -char *b_if_name; -u32 i; - -for (i =0 , b_ptr = tipc_bearers; i <MAX_BEARERS ; i++, b_ptr++) { -if (!b_ptr->active) -continue ; - b_if_name =strchr (b_ptr->name,':' ) +1 ; -if (!strcmp (b_if_name, if_name)) -return b_ptr; - } -return NULL ; -} - -/** * tipc_bearer_get_names - record names of bearers in buffer */ struct sk_buff *tipc_bearer_get_names (void )
net/tipc/bearer.h +0 -1
@@ -190,7 +190,6 @@ struct sk_buff *tipc_bearer_get_names(vovoid tipc_bearer_add_dest (struct tipc_bearer *b_ptr,u32 dest);void tipc_bearer_remove_dest (struct tipc_bearer *b_ptr,u32 dest);struct tipc_bearer *tipc_bearer_find (const char *name); -struct tipc_bearer *tipc_bearer_find_interface (const char *if_name);struct tipc_media *tipc_media_find (const char *name);int tipc_bearer_setup (void );void tipc_bearer_cleanup (void );
net/tipc/node.c +0 -5
@@ -235,11 +235,6 @@ int tipc_node_active_links(struct tipc_nreturn n_ptr->active_links[0 ] !=NULL ; } -int tipc_node_redundant_links (struct tipc_node *n_ptr) -{ -return n_ptr->working_links >1 ; -} -int tipc_node_is_up (struct tipc_node *n_ptr) {return tipc_node_active_links (n_ptr);
net/tipc/node.h +0 -1
@@ -115,7 +115,6 @@ void tipc_node_detach_link(struct tipc_nvoid tipc_node_link_down (struct tipc_node *n_ptr,struct tipc_link *l_ptr);void tipc_node_link_up (struct tipc_node *n_ptr,struct tipc_link *l_ptr);int tipc_node_active_links (struct tipc_node *n_ptr); -int tipc_node_redundant_links (struct tipc_node *n_ptr);int tipc_node_is_up (struct tipc_node *n_ptr);struct sk_buff *tipc_node_get_links (const void *req_tlv_area,int req_tlv_space);struct sk_buff *tipc_node_get_nodes (const void *req_tlv_area,int req_tlv_space);
Re: [PATCH net-next 2/2] tipc: remove unused code
From: Stephen Hemminger <[email protected]>
Date: Sat, 4 Jan 2014 13:49:14 -0800
Quoted 8 lines
Remove dead code;
tipc_bearer_find_interface
tipc_node_redundant_linksThis may break out of tree version of TIPC if there still is one. But that maybe a good thing :-)
Signed-off-by Stephen Hemminger <[email protected]>
Applied.
From: Stephen Hemminger <[email protected]>
Date: Sat, 4 Jan 2014 13:47:48 -0800
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>
Applied.