tipc: update replicast capability for broadcast send link

When setting up a cluster with non-replicast/replicast capability
supported. This capability will be disabled for broadcast send link
in order to be backwards compatible.

However, when these non-support nodes left and be removed out the cluster.
We don't update this capability on broadcast send link. Then, some of
features that based on this capability will also disabling as unexpected.

In this commit, we make sure the broadcast send link capabilities will
be re-calculated as soon as a node removed/rejoined a cluster.

Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index f41096a..55aeba6 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -87,9 +87,9 @@ int tipc_bcast_get_mtu(struct net *net)
        return tipc_link_mss(tipc_bc_sndlink(net));
 }
 
-void tipc_bcast_disable_rcast(struct net *net)
+void tipc_bcast_toggle_rcast(struct net *net, bool supp)
 {
-       tipc_bc_base(net)->rcast_support = false;
+       tipc_bc_base(net)->rcast_support = supp;
 }
 
 static void tipc_bcbase_calc_bc_threshold(struct net *net)

diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index dadad95..9e847d9 100644 (file)
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -85,7 +85,7 @@ void tipc_bcast_remove_peer(struct net *net, struct tipc_link *rcv_bcl);
 void tipc_bcast_inc_bearer_dst_cnt(struct net *net, int bearer_id);
 void tipc_bcast_dec_bearer_dst_cnt(struct net *net, int bearer_id);
 int  tipc_bcast_get_mtu(struct net *net);
-void tipc_bcast_disable_rcast(struct net *net);
+void tipc_bcast_toggle_rcast(struct net *net, bool supp);
 int tipc_mcast_xmit(struct net *net, struct sk_buff_head *pkts,
                    struct tipc_mc_method *method, struct tipc_nlist *dests,
                    u16 *cong_link_cnt);

diff --git a/net/tipc/link.c b/net/tipc/link.c
index fb72031..24d4d10 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -550,7 +550,7 @@ bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer,
 
        /* Disable replicast if even a single peer doesn't support it */
        if (link_is_bc_rcvlink(l) && !(peer_caps & TIPC_BCAST_RCAST))
-               tipc_bcast_disable_rcast(net);
+               tipc_bcast_toggle_rcast(net, false);
 
        return true;
 }

diff --git a/net/tipc/node.c b/net/tipc/node.c
index aaf5956..ab04e00 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -496,6 +496,9 @@ update:
                        tn->capabilities &= temp_node->capabilities;
                }
 
+               tipc_bcast_toggle_rcast(net,
+                                       (tn->capabilities & TIPC_BCAST_RCAST));
+
                goto exit;
        }
        n = kzalloc(sizeof(*n), GFP_ATOMIC);
@@ -557,6 +560,7 @@ update:
        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
                tn->capabilities &= temp_node->capabilities;
        }
+       tipc_bcast_toggle_rcast(net, (tn->capabilities & TIPC_BCAST_RCAST));
        trace_tipc_node_create(n, true, " ");
 exit:
        spin_unlock_bh(&tn->node_list_lock);
@@ -740,7 +744,8 @@ static bool tipc_node_cleanup(struct tipc_node *peer)
        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
                tn->capabilities &= temp_node->capabilities;
        }
-
+       tipc_bcast_toggle_rcast(peer->net,
+                               (tn->capabilities & TIPC_BCAST_RCAST));
        spin_unlock_bh(&tn->node_list_lock);
        return deleted;
 }
@@ -2198,6 +2203,7 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info)
        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
                tn->capabilities &= temp_node->capabilities;
        }
+       tipc_bcast_toggle_rcast(net, (tn->capabilities & TIPC_BCAST_RCAST));
        err = 0;
 err_out:
        tipc_node_put(peer);