---

yaml --- r: 84858 b: refs/heads/master c: 86121fe h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · 61959fa · 61959fa
1 parent 9700021
commit 61959fa
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 40 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04f217aca4d803fe72c2c54fe460d68f5233ce52
+refs/heads/master: 86121fe5b4f170829429433cd99ec7f884c8ae75
diff --git a/trunk/include/net/tipc/tipc_msg.h b/trunk/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/trunk/net/tipc/addr.h b/trunk/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/trunk/net/tipc/bcast.h b/trunk/net/tipc/bcast.h
@@ -73,19 +73,6 @@ struct node;
 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/trunk/net/tipc/msg.h b/trunk/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;