Merge commit 'v2.6.37-rc1' into for-2.6.37

3 files changed, 5 insertions, 78 deletions

diff --git a/include/net/tipc/tipc.h b/include/net/tipc/tipc.h
index 15af6dca0b49..1e0645e1eed2 100644
--- a/include/net/tipc/tipc.h
+++ b/include/net/tipc/tipc.h
@@ -50,8 +50,6 @@
  * TIPC operating mode routines
  */
 
-u32 tipc_get_addr(void);
-
 #define TIPC_NOT_RUNNING  0
 #define TIPC_NODE_MODE    1
 #define TIPC_NET_MODE     2
@@ -62,8 +60,6 @@ int tipc_attach(unsigned int *userref, tipc_mode_event, void *usr_handle);
 
 void tipc_detach(unsigned int userref);
 
-int tipc_get_mode(void);
-
 /*
  * TIPC port manipulation routines
  */
@@ -153,12 +149,6 @@ int tipc_disconnect(u32 portref);
 
 int tipc_shutdown(u32 ref);
 
-int tipc_isconnected(u32 portref, int *isconnected);
-
-int tipc_peer(u32 portref, struct tipc_portid *peer);
-
-int tipc_ref_valid(u32 portref); 
-
 /*
  * TIPC messaging routines
  */
@@ -170,38 +160,12 @@ int tipc_send(u32 portref,
               unsigned int num_sect,
               struct iovec const *msg_sect);
 
-int tipc_send_buf(u32 portref,
-                  struct sk_buff *buf,
-                  unsigned int dsz);
-
 int tipc_send2name(u32 portref, 
                    struct tipc_name const *name, 
                    u32 domain,
                    unsigned int num_sect,
                    struct iovec const *msg_sect);
 
-int tipc_send_buf2name(u32 portref,
-                       struct tipc_name const *name,
-                       u32 domain,
-                       struct sk_buff *buf,
-                       unsigned int dsz);
-
-int tipc_forward2name(u32 portref, 
-                      struct tipc_name const *name, 
-                      u32 domain,
-                      unsigned int section_count,
-                      struct iovec const *msg_sect,
-                      struct tipc_portid const *origin,
-                      unsigned int importance);
-
-int tipc_forward_buf2name(u32 portref,
-                          struct tipc_name const *name,
-                          u32 domain,
-                          struct sk_buff *buf,
-                          unsigned int dsz,
-                          struct tipc_portid const *orig,
-                          unsigned int importance);
-
 int tipc_send2port(u32 portref,
                    struct tipc_portid const *dest,
                    unsigned int num_sect,
@@ -212,46 +176,11 @@ int tipc_send_buf2port(u32 portref,
                        struct sk_buff *buf,
                        unsigned int dsz);
 
-int tipc_forward2port(u32 portref,
-                      struct tipc_portid const *dest,
-                      unsigned int num_sect,
-                      struct iovec const *msg_sect,
-                      struct tipc_portid const *origin,
-                      unsigned int importance);
-
-int tipc_forward_buf2port(u32 portref,
-                          struct tipc_portid const *dest,
-                          struct sk_buff *buf,
-                          unsigned int dsz,
-                          struct tipc_portid const *orig,
-                          unsigned int importance);
-
 int tipc_multicast(u32 portref, 
                    struct tipc_name_seq const *seq, 
                    u32 domain,  /* currently unused */
                    unsigned int section_count,
                    struct iovec const *msg);
-
-#if 0
-int tipc_multicast_buf(u32 portref, 
-                       struct tipc_name_seq const *seq, 
-                       u32 domain,
-                       void *buf,
-                       unsigned int size);
-#endif
-
-/*
- * TIPC subscription routines
- */
-
-int tipc_ispublished(struct tipc_name const *name);
-
-/*
- * Get number of available nodes within specified domain (excluding own node)
- */
-
-unsigned int tipc_available_nodes(const u32 domain);
-
 #endif
 
 #endif
diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h
index 2e159a812f83..ffe50b4e7b93 100644
--- a/include/net/tipc/tipc_msg.h
+++ b/include/net/tipc/tipc_msg.h
@@ -107,7 +107,7 @@ static inline u32 msg_hdr_sz(struct tipc_msg *m)
 
 static inline int msg_short(struct tipc_msg *m)
 {
-        return (msg_hdr_sz(m) == 24);
+        return msg_hdr_sz(m) == 24;
 }
 
 static inline u32 msg_size(struct tipc_msg *m)
@@ -117,7 +117,7 @@ static inline u32 msg_size(struct tipc_msg *m)
 
 static inline u32 msg_data_sz(struct tipc_msg *m)
 {
-        return (msg_size(m) - msg_hdr_sz(m));
+        return msg_size(m) - msg_hdr_sz(m);
 }
 
 static inline unchar *msg_data(struct tipc_msg *m)
@@ -132,17 +132,17 @@ static inline u32 msg_type(struct tipc_msg *m)
 
 static inline u32 msg_named(struct tipc_msg *m)
 {
-        return (msg_type(m) == TIPC_NAMED_MSG);
+        return msg_type(m) == TIPC_NAMED_MSG;
 }
 
 static inline u32 msg_mcast(struct tipc_msg *m)
 {
-        return (msg_type(m) == TIPC_MCAST_MSG);
+        return msg_type(m) == TIPC_MCAST_MSG;
 }
 
 static inline u32 msg_connected(struct tipc_msg *m)
 {
-        return (msg_type(m) == TIPC_CONN_MSG);
+        return msg_type(m) == TIPC_CONN_MSG;
 }
 
 static inline u32 msg_errcode(struct tipc_msg *m)
diff --git a/include/net/tipc/tipc_port.h b/include/net/tipc/tipc_port.h
index c54917cbfa48..1893aaf49426 100644
--- a/include/net/tipc/tipc_port.h
+++ b/include/net/tipc/tipc_port.h
@@ -88,8 +88,6 @@ void tipc_acknowledge(u32 port_ref,u32 ack);
 
 struct tipc_port *tipc_get_port(const u32 ref);
 
-void *tipc_get_handle(const u32 ref);
-
 /*
  * The following routines require that the port be locked on entry
  */