diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index d1a4760..9ddc662 100644
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -30,14 +30,14 @@
 
 	unsigned char iso_listen_count[64];
 
-	int node_count;     /* number of identified nodes on this bus */
-	int selfid_count;   /* total number of SelfIDs received */
-	int nodes_active;   /* number of nodes with active link layer */
-	u8 speed[63];       /* speed between each node and local node */
+	int node_count;      /* number of identified nodes on this bus */
+	int selfid_count;    /* total number of SelfIDs received */
+	int nodes_active;    /* number of nodes with active link layer */
+	u8 speed[ALL_NODES]; /* speed between each node and local node */
 
-	nodeid_t node_id;   /* node ID of this host */
-	nodeid_t irm_id;    /* ID of this bus' isochronous resource manager */
-	nodeid_t busmgr_id; /* ID of this bus' bus manager */
+	nodeid_t node_id;    /* node ID of this host */
+	nodeid_t irm_id;     /* ID of this bus' isochronous resource manager */
+	nodeid_t busmgr_id;  /* ID of this bus' bus manager */
 
 	/* this nodes state */
 	unsigned in_bus_reset:1;
@@ -56,7 +56,7 @@
 	struct csr_control csr;
 
 	/* Per node tlabel pool allocation */
-	struct hpsb_tlabel_pool tpool[64];
+	struct hpsb_tlabel_pool tpool[ALL_NODES];
 
 	struct hpsb_host_driver *driver;