summaryrefslogtreecommitdiffstats
path: root/net/tipc/net.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-15 22:29:51 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-15 22:29:51 -0500
commitbf3f14d6342cfb37eab8f0cddd0e4d4063fd9fc9 (patch)
tree2907cdfb8da2c43bf4c599bc3d398274e21dfc91 /net/tipc/net.c
parent75224c93fa985f4a6fb983f53208f5c5aa555fbf (diff)
downloadlinux-bf3f14d6342cfb37eab8f0cddd0e4d4063fd9fc9.tar.bz2
rhashtable: Revert nested table changes.
This reverts commits: 6a25478077d987edc5e2f880590a2bc5fcab4441 9dbbfb0ab6680c6a85609041011484e6658e7d3c 40137906c5f55c252194ef5834130383e639536f It's too risky to put in this late in the release cycle. We'll put these changes into the next merge window instead. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r--net/tipc/net.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index ab8a2d5d1e32..28bf4feeb81c 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -110,10 +110,6 @@ int tipc_net_start(struct net *net, u32 addr)
char addr_string[16];
tn->own_addr = addr;
-
- /* Ensure that the new address is visible before we reinit. */
- smp_mb();
-
tipc_named_reinit(net);
tipc_sk_reinit(net);