diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/link.c | 2 | ||||
-rw-r--r-- | net/tipc/port.c | 1 | ||||
-rw-r--r-- | net/tipc/port.h | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index c76e82e5f982..0b86f6aef3d8 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -561,7 +561,6 @@ static int link_schedule_port(struct link *l_ptr, u32 origport, u32 sz) | |||
561 | goto exit; | 561 | goto exit; |
562 | if (!list_empty(&p_ptr->wait_list)) | 562 | if (!list_empty(&p_ptr->wait_list)) |
563 | goto exit; | 563 | goto exit; |
564 | p_ptr->congested_link = l_ptr; | ||
565 | p_ptr->publ.congested = 1; | 564 | p_ptr->publ.congested = 1; |
566 | p_ptr->waiting_pkts = 1 + ((sz - 1) / link_max_pkt(l_ptr)); | 565 | p_ptr->waiting_pkts = 1 + ((sz - 1) / link_max_pkt(l_ptr)); |
567 | list_add_tail(&p_ptr->wait_list, &l_ptr->waiting_ports); | 566 | 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) | |||
592 | if (win <= 0) | 591 | if (win <= 0) |
593 | break; | 592 | break; |
594 | list_del_init(&p_ptr->wait_list); | 593 | list_del_init(&p_ptr->wait_list); |
595 | p_ptr->congested_link = NULL; | ||
596 | spin_lock_bh(p_ptr->publ.lock); | 594 | spin_lock_bh(p_ptr->publ.lock); |
597 | p_ptr->publ.congested = 0; | 595 | p_ptr->publ.congested = 0; |
598 | p_ptr->wakeup(&p_ptr->publ); | 596 | p_ptr->wakeup(&p_ptr->publ); |
diff --git a/net/tipc/port.c b/net/tipc/port.c index e70d27ea6578..c703ecbe09d7 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
@@ -247,7 +247,6 @@ struct tipc_port *tipc_createport_raw(void *usr_handle, | |||
247 | p_ptr->sent = 1; | 247 | p_ptr->sent = 1; |
248 | INIT_LIST_HEAD(&p_ptr->wait_list); | 248 | INIT_LIST_HEAD(&p_ptr->wait_list); |
249 | INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list); | 249 | INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list); |
250 | p_ptr->congested_link = NULL; | ||
251 | p_ptr->dispatcher = dispatcher; | 250 | p_ptr->dispatcher = dispatcher; |
252 | p_ptr->wakeup = wakeup; | 251 | p_ptr->wakeup = wakeup; |
253 | p_ptr->user_port = NULL; | 252 | p_ptr->user_port = NULL; |
diff --git a/net/tipc/port.h b/net/tipc/port.h index ff31ee4a1dc3..8d1652aab298 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h | |||
@@ -75,7 +75,6 @@ struct user_port { | |||
75 | * @wakeup: ptr to routine to call when port is no longer congested | 75 | * @wakeup: ptr to routine to call when port is no longer congested |
76 | * @user_port: ptr to user port associated with port (if any) | 76 | * @user_port: ptr to user port associated with port (if any) |
77 | * @wait_list: adjacent ports in list of ports waiting on link congestion | 77 | * @wait_list: adjacent ports in list of ports waiting on link congestion |
78 | * @congested_link: ptr to congested link port is waiting on | ||
79 | * @waiting_pkts: | 78 | * @waiting_pkts: |
80 | * @sent: | 79 | * @sent: |
81 | * @acked: | 80 | * @acked: |
@@ -95,7 +94,6 @@ struct port { | |||
95 | void (*wakeup)(struct tipc_port *); | 94 | void (*wakeup)(struct tipc_port *); |
96 | struct user_port *user_port; | 95 | struct user_port *user_port; |
97 | struct list_head wait_list; | 96 | struct list_head wait_list; |
98 | struct link *congested_link; | ||
99 | u32 waiting_pkts; | 97 | u32 waiting_pkts; |
100 | u32 sent; | 98 | u32 sent; |
101 | u32 acked; | 99 | u32 acked; |