diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-06-21 17:24:35 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-07-08 10:52:02 -0400 |
commit | 250b2b6dd421c9f8844a867d2ac06e0661e0ad93 (patch) | |
tree | b86719d2c442676a52c6307471c9e278b1bd21f5 /include/linux/firewire-cdev.h | |
parent | ae948011071c12ff6a328348859c717ea885ed40 (diff) |
firewire: cdev: fix fw_cdev_event_bus_reset.bm_node_id
Fix an obscure ABI feature that is a bit of a hassle to implement.
However, somebody put it into the ABI, so let's fill in a sensible
value there.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'include/linux/firewire-cdev.h')
-rw-r--r-- | include/linux/firewire-cdev.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h index 8b9b27373219..d31022b05bd9 100644 --- a/include/linux/firewire-cdev.h +++ b/include/linux/firewire-cdev.h | |||
@@ -66,6 +66,10 @@ struct fw_cdev_event_common { | |||
66 | * This event is sent when the bus the device belongs to goes through a bus | 66 | * This event is sent when the bus the device belongs to goes through a bus |
67 | * reset. It provides information about the new bus configuration, such as | 67 | * reset. It provides information about the new bus configuration, such as |
68 | * new node ID for this device, new root ID, and others. | 68 | * new node ID for this device, new root ID, and others. |
69 | * | ||
70 | * If @bm_node_id is 0xffff right after bus reset it can be reread by an | ||
71 | * %FW_CDEV_IOC_GET_INFO ioctl after bus manager selection was finished. | ||
72 | * Kernels with ABI version < 4 do not set @bm_node_id. | ||
69 | */ | 73 | */ |
70 | struct fw_cdev_event_bus_reset { | 74 | struct fw_cdev_event_bus_reset { |
71 | __u64 closure; | 75 | __u64 closure; |
@@ -348,6 +352,7 @@ union fw_cdev_event { | |||
348 | * 3 (2.6.34) - made &fw_cdev_get_cycle_timer reliable | 352 | * 3 (2.6.34) - made &fw_cdev_get_cycle_timer reliable |
349 | * - added %FW_CDEV_IOC_GET_CYCLE_TIMER2 | 353 | * - added %FW_CDEV_IOC_GET_CYCLE_TIMER2 |
350 | * 4 (2.6.36) - added %FW_CDEV_EVENT_REQUEST2 | 354 | * 4 (2.6.36) - added %FW_CDEV_EVENT_REQUEST2 |
355 | * - implemented &fw_cdev_event_bus_reset.bm_node_id | ||
351 | */ | 356 | */ |
352 | #define FW_CDEV_VERSION 3 /* Meaningless; don't use this macro. */ | 357 | #define FW_CDEV_VERSION 3 /* Meaningless; don't use this macro. */ |
353 | 358 | ||