diff options
author | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
commit | 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 (patch) | |
tree | c5a3439c1c140eb87f7e3ece2e1148dece037b4f /net/tipc/addr.h | |
parent | a7fed7620b6eeaba98a558df46bb50a31828b462 (diff) | |
parent | 520b2756d9414cb6b0f6fc70714e95ee9248ebf4 (diff) |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'net/tipc/addr.h')
-rw-r--r-- | net/tipc/addr.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/tipc/addr.h b/net/tipc/addr.h index 8971aba99aea..e4f35afe3207 100644 --- a/net/tipc/addr.h +++ b/net/tipc/addr.h @@ -37,14 +37,17 @@ #ifndef _TIPC_ADDR_H #define _TIPC_ADDR_H +#define TIPC_ZONE_MASK 0xff000000u +#define TIPC_CLUSTER_MASK 0xfffff000u + static inline u32 tipc_zone_mask(u32 addr) { - return addr & 0xff000000u; + return addr & TIPC_ZONE_MASK; } static inline u32 tipc_cluster_mask(u32 addr) { - return addr & 0xfffff000u; + return addr & TIPC_CLUSTER_MASK; } static inline int in_own_cluster(u32 addr) |