summaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.h
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2018-03-22 20:42:46 +0100
committerDavid S. Miller <davem@davemloft.net>2018-03-23 13:12:17 -0400
commitb39e465e56ec38ca64b4c0affeb6411eb0ed7267 (patch)
tree0666c2ef9a43d7ed07d75f05ffdfda202eb593da /net/tipc/bearer.h
parentcb30a63384bc91d5da06e1cede1115f666a29271 (diff)
downloadlinux-b39e465e56ec38ca64b4c0affeb6411eb0ed7267.tar.gz
linux-b39e465e56ec38ca64b4c0affeb6411eb0ed7267.tar.bz2
linux-b39e465e56ec38ca64b4c0affeb6411eb0ed7267.zip
tipc: some cleanups in the file discover.c
To facilitate the coming changes in the neighbor discovery functionality we make some renaming and refactoring of that code. The functional changes in this commit are trivial, e.g., that we move the message sending call in tipc_disc_timeout() outside the spinlock protected region. Acked-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r--net/tipc/bearer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index a53613d95bc9..6efcee63a381 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -159,7 +159,7 @@ struct tipc_bearer {
u32 tolerance;
u32 domain;
u32 identity;
- struct tipc_link_req *link_req;
+ struct tipc_discoverer *disc;
char net_plane;
unsigned long up;
};