6 files changed, 19 insertions, 16 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 771d17783c18..750648df13f4 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -170,7 +170,7 @@ static inline int skb_frags_no(struct sk_buff *skb)
 int bt_err(__u16 code);
 
 extern int hci_sock_init(void);
-extern int hci_sock_cleanup(void);
+extern void hci_sock_cleanup(void);
 
 extern int bt_sysfs_init(void);
 extern void bt_sysfs_cleanup(void);
diff --git a/include/net/dst.h b/include/net/dst.h
index e3ac7d0fc4e1..ae13370e8484 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -52,15 +52,10 @@ struct dst_entry
         unsigned short          header_len;     /* more space at head required */
         unsigned short          trailer_len;    /* space to reserve at tail */
 
-        u32                     metrics[RTAX_MAX];
-        struct dst_entry        *path;
-
-        unsigned long           rate_last;      /* rate limiting for ICMP */
         unsigned int            rate_tokens;
+        unsigned long           rate_last;      /* rate limiting for ICMP */
 
-#ifdef CONFIG_NET_CLS_ROUTE
-        __u32                   tclassid;
-#endif
+        struct dst_entry        *path;
 
         struct neighbour        *neighbour;
         struct hh_cache         *hh;
@@ -70,10 +65,20 @@ struct dst_entry
         int                     (*output)(struct sk_buff*);
 
         struct  dst_ops         *ops;
-                
-        unsigned long           lastuse;
+
+        u32                     metrics[RTAX_MAX];
+
+#ifdef CONFIG_NET_CLS_ROUTE
+        __u32                   tclassid;
+#endif
+
+        /*
+         * __refcnt wants to be on a different cache line from
+         * input/output/ops or performance tanks badly
+         */
         atomic_t                __refcnt;       /* client references    */
         int                     __use;
+        unsigned long           lastuse;
         union {
                 struct dst_entry *next;
                 struct rtable    *rt_next;
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h
index 32c385dd9e06..0788c23d2828 100644
--- a/include/net/irda/irttp.h
+++ b/include/net/irda/irttp.h
@@ -169,17 +169,17 @@ int irttp_disconnect_request(struct tsap_cb *self, struct sk_buff *skb,
 void irttp_flow_request(struct tsap_cb *self, LOCAL_FLOW flow);
 struct tsap_cb *irttp_dup(struct tsap_cb *self, void *instance);
 
-static __inline __u32 irttp_get_saddr(struct tsap_cb *self)
+static inline __u32 irttp_get_saddr(struct tsap_cb *self)
 {
         return irlmp_get_saddr(self->lsap);
 }
 
-static __inline __u32 irttp_get_daddr(struct tsap_cb *self)
+static inline __u32 irttp_get_daddr(struct tsap_cb *self)
 {
         return irlmp_get_daddr(self->lsap);
 }
 
-static __inline __u32 irttp_get_max_seg_size(struct tsap_cb *self)
+static inline __u32 irttp_get_max_seg_size(struct tsap_cb *self)
 {
         return self->max_seg_size;
 }
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 28738b7d53eb..923f2b8b9096 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -31,7 +31,6 @@ struct net {
 
         struct proc_dir_entry   *proc_net;
         struct proc_dir_entry   *proc_net_stat;
-        struct proc_dir_entry   *proc_net_root;
 
         struct list_head        sysctl_table_headers;
 
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 49aac6323fbe..f736e842977f 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -17,7 +17,6 @@ enum nf_ct_ext_id
 struct nf_ct_ext {
         u8 offset[NF_CT_EXT_NUM];
         u8 len;
-        u8 real_len;
         char data[0];
 };
 
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9b6205665190..c435620dbb37 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -278,7 +278,7 @@ extern int __xfrm_state_delete(struct xfrm_state *x);
 struct xfrm_state_afinfo {
         unsigned int            family;
         unsigned int            proto;
-        unsigned int            eth_proto;
+        __be16                  eth_proto;
         struct module           *owner;
         const struct xfrm_type  *type_map[IPPROTO_MAX];
         struct xfrm_mode        *mode_map[XFRM_MODE_MAX];