Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / tipc / node.h

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 72561c971d6735f622fe65428b013e6e0d683f20..3c189b35b102a378914b59236f555438f7c198d4 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -48,7 +48,6 @@
 #define INVALID_NODE_SIG 0x10000
 
 /* Flags used to block (re)establishment of contact with a neighboring node */
-
 #define WAIT_PEER_DOWN 0x0001  /* wait to see that peer's links are down */
 #define WAIT_NAMES_GONE        0x0002  /* wait for peer's publications to be purged */
 #define WAIT_NODE_DOWN 0x0004  /* wait until peer node is declared down */
@@ -68,8 +67,6 @@
  * @permit_changeover: non-zero if node has redundant links to this system
  * @signature: node instance identifier
  * @bclink: broadcast-related info
- *    @supportable: non-zero if node supports TIPC b'cast link capability
- *    @supported: non-zero if node supports TIPC b'cast capability
  *    @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
@@ -78,8 +75,8 @@
  *    @deferred_head: oldest OOS b'cast message received from node
  *    @deferred_tail: newest OOS b'cast message received from node
  *    @defragm: list of partially reassembled b'cast message fragments from node
+ *    @recv_permitted: true if node is allowed to receive b'cast messages
  */
-
 struct tipc_node {
        u32 addr;
        spinlock_t lock;
@@ -94,8 +91,6 @@ struct tipc_node {
        int permit_changeover;
        u32 signature;
        struct {
-               u8 supportable;
-               u8 supported;
                u32 acked;
                u32 last_in;
                u32 last_sent;
@@ -104,6 +99,7 @@ struct tipc_node {
                struct sk_buff *deferred_head;
                struct sk_buff *deferred_tail;
                struct sk_buff *defragm;
+               bool recv_permitted;
        } bclink;
 };