Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

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

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 72561c971d6735f622fe65428b013e6e0d683f20..cfcaf4d6e4801c5047f665a8c4b272948e260bf6 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 */
@@ -79,7 +78,6 @@
  *    @deferred_tail: newest OOS b'cast message received from node
  *    @defragm: list of partially reassembled b'cast message fragments from node
  */
-
 struct tipc_node {
        u32 addr;
        spinlock_t lock;