diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-01 03:42:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-01 03:42:30 +0200 |
| commit | b6d151bb8261a229555cbd0704749de099104bbd (patch) | |
| tree | 8ddca4c7fee9cd4c55021489459ee44ba263e4db /net/tipc/name_table.h | |
| parent | bnx2x: remove some bloat (diff) | |
| parent | tipc: compress out gratuitous extra carriage returns (diff) | |
| download | linux-b6d151bb8261a229555cbd0704749de099104bbd.tar.xz linux-b6d151bb8261a229555cbd0704749de099104bbd.zip | |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/tipc/name_table.h')
| -rw-r--r-- | net/tipc/name_table.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h index 207d59ebf849..71cb4dc712df 100644 --- a/net/tipc/name_table.h +++ b/net/tipc/name_table.h @@ -45,10 +45,8 @@ struct tipc_port_list; /* * TIPC name types reserved for internal TIPC use (both current and planned) */ - #define TIPC_ZM_SRV 3 /* zone master service name type */ - /** * struct publication - info about a published (name or) name sequence * @type: name sequence type @@ -67,7 +65,6 @@ struct tipc_port_list; * * Note that the node list, cluster list, and zone list are circular lists. */ - struct publication { u32 type; u32 lower; |