diff options
| -rw-r--r-- | include/net/tipc/tipc_msg.h | 16 | ||||
| -rw-r--r-- | net/tipc/addr.h | 5 | ||||
| -rw-r--r-- | net/tipc/bcast.h | 13 | ||||
| -rw-r--r-- | net/tipc/msg.h | 5 |
4 files changed, 0 insertions, 39 deletions
diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h index fb42eb7a86a..2e159a812f8 100644 --- a/include/net/tipc/tipc_msg.h +++ b/include/net/tipc/tipc_msg.h @@ -130,11 +130,6 @@ static inline u32 msg_type(struct tipc_msg *m) return msg_bits(m, 1, 29, 0x7); } -static inline u32 msg_direct(struct tipc_msg *m) -{ - return (msg_type(m) == TIPC_DIRECT_MSG); -} - static inline u32 msg_named(struct tipc_msg *m) { return (msg_type(m) == TIPC_NAMED_MSG); @@ -207,17 +202,6 @@ static inline u32 msg_nameupper(struct tipc_msg *m) return msg_word(m, 10); } -static inline char *msg_options(struct tipc_msg *m, u32 *len) -{ - u32 pos = msg_bits(m, 1, 16, 0x7); - - if (!pos) - return 0; - pos = (pos * 4) + 28; - *len = msg_hdr_sz(m) - pos; - return (char *)&m->hdr[pos/4]; -} - #endif #endif diff --git a/net/tipc/addr.h b/net/tipc/addr.h index e4bd5335e48..3ba67e6ce03 100644 --- a/net/tipc/addr.h +++ b/net/tipc/addr.h @@ -57,11 +57,6 @@ static inline int in_own_cluster(u32 addr) return !((addr ^ tipc_own_addr) >> 12); } -static inline int in_own_zone(u32 addr) -{ - return !((addr ^ tipc_own_addr) >> 24); -} - static inline int is_slave(u32 addr) { return addr & 0x800; diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index f910ed29d05..a2416fa6b90 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h @@ -74,19 +74,6 @@ extern char tipc_bclink_name[]; /** - * nmap_get - determine if node exists in a node map - */ - -static inline int tipc_nmap_get(struct node_map *nm_ptr, u32 node) -{ - int n = tipc_node(node); - int w = n / WSIZE; - int b = n % WSIZE; - - return nm_ptr->map[w] & (1 << b); -} - -/** * nmap_add - add a node to a node map */ diff --git a/net/tipc/msg.h b/net/tipc/msg.h index ce265983637..e9ef6df2656 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -663,11 +663,6 @@ static inline void msg_set_remote_node(struct tipc_msg *m, u32 a) msg_set_word(m, msg_hdr_sz(m)/4, a); } -static inline int msg_dataoctet(struct tipc_msg *m, u32 pos) -{ - return(msg_data(m)[pos + 4] != 0); -} - static inline void msg_set_dataoctet(struct tipc_msg *m, u32 pos) { msg_data(m)[pos + 4] = 1; |