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

Commit df4ef337 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Eliminate obsolete port's "congested_link" field 



Eliminate a field of the TIPC port structure that is populated,
but never referenced.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b7ce2b7

net/tipc/link.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -561,7 +561,6 @@ static int link_schedule_port(struct link *l_ptr, u32 origport, u32 sz) 
			goto exit;

			goto exit;

		if (!list_empty(&p_ptr->wait_list))

		if (!list_empty(&p_ptr->wait_list))

			goto exit;

			goto exit;

		p_ptr->congested_link = l_ptr;

		p_ptr->publ.congested = 1;

		p_ptr->publ.congested = 1;

		p_ptr->waiting_pkts = 1 + ((sz - 1) / link_max_pkt(l_ptr));

		p_ptr->waiting_pkts = 1 + ((sz - 1) / link_max_pkt(l_ptr));

		list_add_tail(&p_ptr->wait_list, &l_ptr->waiting_ports);

		list_add_tail(&p_ptr->wait_list, &l_ptr->waiting_ports);
@@ -592,7 +591,6 @@ void tipc_link_wakeup_ports(struct link *l_ptr, int all) 
		if (win <= 0)

		if (win <= 0)

			break;

			break;

		list_del_init(&p_ptr->wait_list);

		list_del_init(&p_ptr->wait_list);

		p_ptr->congested_link = NULL;

		spin_lock_bh(p_ptr->publ.lock);

		spin_lock_bh(p_ptr->publ.lock);

		p_ptr->publ.congested = 0;

		p_ptr->publ.congested = 0;

		p_ptr->wakeup(&p_ptr->publ);

		p_ptr->wakeup(&p_ptr->publ);

net/tipc/port.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,6 @@ struct tipc_port *tipc_createport_raw(void *usr_handle, 
	p_ptr->sent = 1;

	p_ptr->sent = 1;

	INIT_LIST_HEAD(&p_ptr->wait_list);

	INIT_LIST_HEAD(&p_ptr->wait_list);

	INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list);

	INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list);

	p_ptr->congested_link = NULL;

	p_ptr->dispatcher = dispatcher;

	p_ptr->dispatcher = dispatcher;

	p_ptr->wakeup = wakeup;

	p_ptr->wakeup = wakeup;

	p_ptr->user_port = NULL;

	p_ptr->user_port = NULL;

net/tipc/port.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ struct user_port { 
 * @wakeup: ptr to routine to call when port is no longer congested

 * @wakeup: ptr to routine to call when port is no longer congested

 * @user_port: ptr to user port associated with port (if any)

 * @user_port: ptr to user port associated with port (if any)

 * @wait_list: adjacent ports in list of ports waiting on link congestion

 * @wait_list: adjacent ports in list of ports waiting on link congestion

 * @congested_link: ptr to congested link port is waiting on

 * @waiting_pkts:

 * @waiting_pkts:

 * @sent:

 * @sent:

 * @acked:

 * @acked:
@@ -95,7 +94,6 @@ struct port { 
	void (*wakeup)(struct tipc_port *);

	void (*wakeup)(struct tipc_port *);

	struct user_port *user_port;

	struct user_port *user_port;

	struct list_head wait_list;

	struct list_head wait_list;

	struct link *congested_link;

	u32 waiting_pkts;

	u32 waiting_pkts;

	u32 sent;

	u32 sent;

	u32 acked;

	u32 acked;