1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index db30a752a87a..adc5b55e6e5f 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -114,8 +114,10 @@ struct fw_card {
        struct list_head link;
-        /* Work struct for BM duties. */
+        struct delayed_work br_work; /* bus reset job */
-        struct delayed_work work;
+        bool br_short;
+        struct delayed_work bm_work; /* bus manager job */
        int bm_retries;
        int bm_generation;
        __be32 bm_transaction_data[2];

diff --git a/include/linux/firewire.h b/include/linux/firewire.h index db30a752a87a..adc5b55e6e5f 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h
@@ -114,8 +114,10 @@ struct fw_card {
114		114
115	struct list_head link;	115	struct list_head link;
116		116
117	/* Work struct for BM duties. */	117	struct delayed_work br_work; /* bus reset job */
118	struct delayed_work work;	118	bool br_short;
		119
		120	struct delayed_work bm_work; /* bus manager job */
119	int bm_retries;	121	int bm_retries;
120	int bm_generation;	122	int bm_generation;
121	__be32 bm_transaction_data[2];	123	__be32 bm_transaction_data[2];