lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: Eliminate obsolete port's "congested_link" field

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

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:03 +00:00
committed by David S. Miller
parent 9b7ce2b762
commit df4ef33716
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/tipc/link.c
View File

@@ -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);

1
net/tipc/port.c
View File

@@ -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;

2
net/tipc/port.h
View File

@@ -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;