git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
net
/
tipc
/
addr.h
diff --git
a/net/tipc/addr.h
b/net/tipc/addr.h
index
02ca717
..
3ba67e6
100644
(file)
--- a/
net/tipc/addr.h
+++ b/
net/tipc/addr.h
@@
-1,6
+1,6
@@
/*
* net/tipc/addr.h: Include file for TIPC address utility routines
/*
* net/tipc/addr.h: Include file for TIPC address utility routines
- *
+ *
* Copyright (c) 2000-2006, Ericsson AB
* Copyright (c) 2004-2005, Wind River Systems
* All rights reserved.
* Copyright (c) 2000-2006, Ericsson AB
* Copyright (c) 2004-2005, Wind River Systems
* All rights reserved.
@@
-57,11
+57,6
@@
static inline int in_own_cluster(u32 addr)
return !((addr ^ tipc_own_addr) >> 12);
}
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;
static inline int is_slave(u32 addr)
{
return addr & 0x800;
@@
-100,8
+95,8
@@
static inline int addr_scope(u32 domain)
/**
* addr_domain - convert 2-bit scope value to equivalent message lookup domain
/**
* addr_domain - convert 2-bit scope value to equivalent message lookup domain
- *
- * Needed when address of a named message must be looked up a second time
+ *
+ * Needed when address of a named message must be looked up a second time
* after a network hop.
*/
* after a network hop.
*/
@@
-122,7
+117,7
@@
static inline char *addr_string_fill(char *string, u32 addr)
return string;
}
return string;
}
-int addr_domain_valid(u32);
-int addr_node_valid(u32 addr);
+int
tipc_
addr_domain_valid(u32);
+int
tipc_
addr_node_valid(u32 addr);
#endif
#endif