diff options
author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-07-30 18:24:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-30 20:25:14 -0400 |
commit | 23d8335d786472021b5c733f228c7074208dcfa0 (patch) | |
tree | c7bcdc08b5567835c5a38f0d93cc46c7e8a55fea /net/tipc/node.h | |
parent | 598411d70f85dcf5b5c6c2369cc48637c251b656 (diff) |
tipc: remove implicit message delivery in node_unlock()
After the most recent changes, all access calls to a link which
may entail addition of messages to the link's input queue are
postpended by an explicit call to tipc_sk_rcv(), using a reference
to the correct queue.
This means that the potentially hazardous implicit delivery, using
tipc_node_unlock() in combination with a binary flag and a cached
queue pointer, now has become redundant.
This commit removes this implicit delivery mechanism both for regular
data messages and for binding table update messages.
Tested-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/node.h')
-rw-r--r-- | net/tipc/node.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/tipc/node.h b/net/tipc/node.h index 9a977467fc46..344b3e7594fd 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
@@ -53,13 +53,11 @@ | |||
53 | * TIPC_DISTRIBUTE_NAME: publish or withdraw link state name type | 53 | * TIPC_DISTRIBUTE_NAME: publish or withdraw link state name type |
54 | */ | 54 | */ |
55 | enum { | 55 | enum { |
56 | TIPC_MSG_EVT = 1, | ||
57 | TIPC_NOTIFY_NODE_DOWN = (1 << 3), | 56 | TIPC_NOTIFY_NODE_DOWN = (1 << 3), |
58 | TIPC_NOTIFY_NODE_UP = (1 << 4), | 57 | TIPC_NOTIFY_NODE_UP = (1 << 4), |
59 | TIPC_WAKEUP_BCAST_USERS = (1 << 5), | 58 | TIPC_WAKEUP_BCAST_USERS = (1 << 5), |
60 | TIPC_NOTIFY_LINK_UP = (1 << 6), | 59 | TIPC_NOTIFY_LINK_UP = (1 << 6), |
61 | TIPC_NOTIFY_LINK_DOWN = (1 << 7), | 60 | TIPC_NOTIFY_LINK_DOWN = (1 << 7), |
62 | TIPC_NAMED_MSG_EVT = (1 << 8), | ||
63 | TIPC_BCAST_MSG_EVT = (1 << 9), | 61 | TIPC_BCAST_MSG_EVT = (1 << 9), |
64 | TIPC_BCAST_RESET = (1 << 10) | 62 | TIPC_BCAST_RESET = (1 << 10) |
65 | }; | 63 | }; |
@@ -124,8 +122,6 @@ struct tipc_node { | |||
124 | spinlock_t lock; | 122 | spinlock_t lock; |
125 | struct net *net; | 123 | struct net *net; |
126 | struct hlist_node hash; | 124 | struct hlist_node hash; |
127 | struct sk_buff_head *inputq; | ||
128 | struct sk_buff_head *namedq; | ||
129 | int active_links[2]; | 125 | int active_links[2]; |
130 | struct tipc_link_entry links[MAX_BEARERS]; | 126 | struct tipc_link_entry links[MAX_BEARERS]; |
131 | int action_flags; | 127 | int action_flags; |