4 files changed, 15 insertions, 84 deletions

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index bd10a7908993..65af9a07cf76 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -41,6 +41,8 @@ struct net {
                                                  * destroy on demand
                                                  */
 #endif
+        spinlock_t              rules_mod_lock;
+
         struct list_head        list;           /* list of network namespaces */
         struct list_head        cleanup_list;   /* namespaces on death row */
         struct list_head        exit_list;      /* Use only net_mutex */
@@ -52,7 +54,8 @@ struct net {
         struct ctl_table_set    sysctls;
 #endif
 
-        struct net_device       *loopback_dev;          /* The loopback */
+        struct sock             *rtnl;                  /* rtnetlink socket */
+        struct sock             *genl_sock;
 
         struct list_head        dev_base_head;
         struct hlist_head       *dev_name_head;
@@ -60,11 +63,9 @@ struct net {
 
         /* core fib_rules */
         struct list_head        rules_ops;
-        spinlock_t              rules_mod_lock;
 
-        struct sock             *rtnl;                  /* rtnetlink socket */
-        struct sock             *genl_sock;
 
+        struct net_device       *loopback_dev;          /* The loopback */
         struct netns_core       core;
         struct netns_mib        mib;
         struct netns_packet     packet;
@@ -84,13 +85,15 @@ struct net {
         struct sock             *nfnl;
         struct sock             *nfnl_stash;
 #endif
-#ifdef CONFIG_XFRM
-        struct netns_xfrm       xfrm;
-#endif
 #ifdef CONFIG_WEXT_CORE
         struct sk_buff_head     wext_nlevents;
 #endif
         struct net_generic      *gen;
+
+        /* Note : following structs are cache line aligned */
+#ifdef CONFIG_XFRM
+        struct netns_xfrm       xfrm;
+#endif
 };
 
 
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 74f119a2829a..748f91f87cd5 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -43,10 +43,6 @@ struct netns_xfrm {
         unsigned int            policy_count[XFRM_POLICY_MAX * 2];
         struct work_struct      policy_hash_work;
 
-        struct dst_ops          xfrm4_dst_ops;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-        struct dst_ops          xfrm6_dst_ops;
-#endif
 
         struct sock             *nlsk;
         struct sock             *nlsk_stash;
@@ -58,6 +54,11 @@ struct netns_xfrm {
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_hdr;
 #endif
+
+        struct dst_ops          xfrm4_dst_ops;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        struct dst_ops          xfrm6_dst_ops;
+#endif
 };
 
 #endif
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_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
  */