1 files changed, 15 insertions, 26 deletions

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 344b3e7594fd..6734562d3c6e 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -55,36 +55,18 @@
 enum {
         TIPC_NOTIFY_NODE_DOWN           = (1 << 3),
         TIPC_NOTIFY_NODE_UP             = (1 << 4),
-        TIPC_WAKEUP_BCAST_USERS         = (1 << 5),
         TIPC_NOTIFY_LINK_UP             = (1 << 6),
-        TIPC_NOTIFY_LINK_DOWN           = (1 << 7),
-        TIPC_BCAST_MSG_EVT              = (1 << 9),
-        TIPC_BCAST_RESET                = (1 << 10)
+        TIPC_NOTIFY_LINK_DOWN           = (1 << 7)
 };
 
-/**
- * struct tipc_node_bclink - TIPC node bclink structure
- * @acked: sequence # of last outbound b'cast message acknowledged by node
- * @last_in: sequence # of last in-sequence b'cast message received from node
- * @last_sent: sequence # of last b'cast message sent by node
- * @oos_state: state tracker for handling OOS b'cast messages
- * @deferred_queue: deferred queue saved OOS b'cast message received from node
- * @reasm_buf: broadcast reassembly queue head from node
- * @inputq_map: bitmap indicating which inqueues should be kicked
- * @recv_permitted: true if node is allowed to receive b'cast messages
+/* Optional capabilities supported by this code version
  */
-struct tipc_node_bclink {
-        u32 acked;
-        u32 last_in;
-        u32 last_sent;
-        u32 oos_state;
-        u32 deferred_size;
-        struct sk_buff_head deferdq;
-        struct sk_buff *reasm_buf;
-        struct sk_buff_head namedq;
-        bool recv_permitted;
+enum {
+        TIPC_BCAST_SYNCH = (1 << 1)
 };
 
+#define TIPC_NODE_CAPABILITIES TIPC_BCAST_SYNCH
+
 struct tipc_link_entry {
         struct tipc_link *link;
         u32 mtu;
@@ -92,6 +74,14 @@ struct tipc_link_entry {
         struct tipc_media_addr maddr;
 };
 
+struct tipc_bclink_entry {
+        struct tipc_link *link;
+        struct sk_buff_head inputq1;
+        struct sk_buff_head arrvq;
+        struct sk_buff_head inputq2;
+        struct sk_buff_head namedq;
+};
+
 /**
  * struct tipc_node - TIPC node structure
  * @addr: network address of node
@@ -104,7 +94,6 @@ struct tipc_link_entry {
  * @active_links: bearer ids of active links, used as index into links[] array
  * @links: array containing references to all links to node
  * @action_flags: bit mask of different types of node actions
- * @bclink: broadcast-related info
  * @state: connectivity state vs peer node
  * @sync_point: sequence number where synch/failover is finished
  * @list: links to adjacent nodes in sorted list of cluster's nodes
@@ -124,8 +113,8 @@ struct tipc_node {
         struct hlist_node hash;
         int active_links[2];
         struct tipc_link_entry links[MAX_BEARERS];
+        struct tipc_bclink_entry bc_entry;
         int action_flags;
-        struct tipc_node_bclink bclink;
         struct list_head list;
         int state;
         u16 sync_point;