Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2af5ae37 authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller
Browse files

tipc: clean up unused code and structures 



After the previous changes in this series, we can now remove some
unused code and structures, both in the broadcast, link aggregation
and link code.

There are no functional changes in this commit.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c49a0a84

net/tipc/bcast.c

+17 −798

File changed.

Preview size limit exceeded, changes collapsed.

net/tipc/bcast.h

+1 −14
Original line number Original line Diff line number Diff line
@@ -52,28 +52,15 @@ void tipc_bcast_add_peer(struct net *net, struct tipc_link *l, 
void tipc_bcast_remove_peer(struct net *net, struct tipc_link *rcv_bcl);

void tipc_bcast_remove_peer(struct net *net, struct tipc_link *rcv_bcl);

void tipc_bcast_inc_bearer_dst_cnt(struct net *net, int bearer_id);

void tipc_bcast_inc_bearer_dst_cnt(struct net *net, int bearer_id);

void tipc_bcast_dec_bearer_dst_cnt(struct net *net, int bearer_id);

void tipc_bcast_dec_bearer_dst_cnt(struct net *net, int bearer_id);

struct tipc_node *tipc_bclink_retransmit_to(struct net *tn);

void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked);

void tipc_bclink_rcv(struct net *net, struct sk_buff *buf);

u32  tipc_bclink_get_last_sent(struct net *net);

u32  tipc_bclink_acks_missing(struct tipc_node *n_ptr);

void tipc_bclink_update_link_state(struct tipc_node *node,

				   u32 last_sent);

void tipc_bcbearer_sort(struct net *net, struct tipc_node_map *nm_ptr,

			u32 node, bool action);

int  tipc_bclink_reset_stats(struct net *net);

int  tipc_bclink_set_queue_limits(struct net *net, u32 limit);

int  tipc_bcast_get_mtu(struct net *net);

int  tipc_bcast_get_mtu(struct net *net);

int tipc_bcast_xmit(struct net *net, struct sk_buff_head *list);

int tipc_bcast_xmit(struct net *net, struct sk_buff_head *list);

int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb);

int tipc_bcast_rcv(struct net *net, struct tipc_link *l, struct sk_buff *skb);

void tipc_bcast_ack_rcv(struct net *net, struct tipc_link *l, u32 acked);

void tipc_bcast_ack_rcv(struct net *net, struct tipc_link *l, u32 acked);

void tipc_bcast_sync_rcv(struct net *net, struct tipc_link *l,

void tipc_bcast_sync_rcv(struct net *net, struct tipc_link *l,

			 struct tipc_msg *hdr);

			 struct tipc_msg *hdr);

void tipc_bclink_wakeup_users(struct net *net);

int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg);

int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg);

int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[]);

int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[]);

void tipc_bclink_input(struct net *net);

int tipc_bclink_reset_stats(struct net *net);

void tipc_bclink_sync_state(struct tipc_node *n, struct tipc_msg *msg);





static inline void tipc_bcast_lock(struct net *net)

static inline void tipc_bcast_lock(struct net *net)

{

{

net/tipc/bearer.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -440,25 +440,6 @@ int tipc_l2_send_msg(struct net *net, struct sk_buff *skb, 
	return 0;

	return 0;

}

}





/* tipc_bearer_send- sends buffer to destination over bearer

 *

 * IMPORTANT:

 * The media send routine must not alter the buffer being passed in

 * as it may be needed for later retransmission!

 */

void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,

		      struct tipc_media_addr *dest)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	struct tipc_bearer *b_ptr;



	rcu_read_lock();

	b_ptr = rcu_dereference_rtnl(tn->bearer_list[bearer_id]);

	if (likely(b_ptr))

		b_ptr->media->send_msg(net, buf, b_ptr, dest);

	rcu_read_unlock();

}



int tipc_bearer_mtu(struct net *net, u32 bearer_id)

int tipc_bearer_mtu(struct net *net, u32 bearer_id)

{

{

	int mtu = 0;

	int mtu = 0;

net/tipc/bearer.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -216,8 +216,6 @@ struct tipc_media *tipc_media_find(const char *name); 
int tipc_bearer_setup(void);

int tipc_bearer_setup(void);

void tipc_bearer_cleanup(void);

void tipc_bearer_cleanup(void);

void tipc_bearer_stop(struct net *net);

void tipc_bearer_stop(struct net *net);

void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,

		      struct tipc_media_addr *dest);

int tipc_bearer_mtu(struct net *net, u32 bearer_id);

int tipc_bearer_mtu(struct net *net, u32 bearer_id);

void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id,

void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id,

			  struct sk_buff *skb,

			  struct sk_buff *skb,

net/tipc/core.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -62,7 +62,6 @@ 




struct tipc_node;

struct tipc_node;

struct tipc_bearer;

struct tipc_bearer;

struct tipc_bcbearer;

struct tipc_bc_base;

struct tipc_bc_base;

struct tipc_link;

struct tipc_link;

struct tipc_name_table;

struct tipc_name_table;
@@ -94,7 +93,6 @@ struct tipc_net { 




	/* Broadcast link */

	/* Broadcast link */

	spinlock_t bclock;

	spinlock_t bclock;

	struct tipc_bcbearer *bcbearer;

	struct tipc_bc_base *bcbase;

	struct tipc_bc_base *bcbase;

	struct tipc_link *bcl;

	struct tipc_link *bcl;