From 54dd368e04b74601d60600d23a415c2b72bb5b5b Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 29 Nov 2008 19:00:56 +0100 Subject: [PATCH] --- yaml --- r: 127185 b: refs/heads/master c: c8a12d45d543905a2718fccafd612edbd73a1341 h: refs/heads/master i: 127183: 29022d5db70a06a1ddd3e90e6a68ac503fbc19d5 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-transaction.h | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c9882a79e2a8..80e5bb4a5335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6f95a3d14dc403881b23ad268ec1e3600c4e6b4 +refs/heads/master: c8a12d45d543905a2718fccafd612edbd73a1341 diff --git a/trunk/drivers/firewire/fw-transaction.h b/trunk/drivers/firewire/fw-transaction.h index 5a57bb897e23..c9ab12a15f6e 100644 --- a/trunk/drivers/firewire/fw-transaction.h +++ b/trunk/drivers/firewire/fw-transaction.h @@ -237,13 +237,6 @@ struct fw_card { int link_speed; int config_rom_generation; - /* - * We need to store up to 4 self ID for a maximum of 63 - * devices plus 3 words for the topology map header. - */ - u32 topology_map[252 + 3]; - u32 broadcast_channel; - spinlock_t lock; /* Take this lock when handling the lists in * this struct. */ struct fw_node *local_node; @@ -261,6 +254,9 @@ struct fw_card { struct delayed_work work; int bm_retries; int bm_generation; + + u32 broadcast_channel; + u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4]; }; static inline struct fw_card *fw_card_get(struct fw_card *card)