firewire: Add generation field to send_request ioctl struct.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
index 68428d013d8d99d068ff16d4f94486e637f22538..7b0efccf78f1eecdf5ff8f459f9f3563c1b83fb5 100644 (file)
--- a/drivers/firewire/fw-device-cdev.c
+++ b/drivers/firewire/fw-device-cdev.c
@@ -359,7 +359,7 @@ static ssize_t ioctl_send_request(struct client *client, void __user *arg)
        fw_send_request(device->card, &response->transaction,
                        request.tcode & 0x1f,
                        device->node->node_id,
-                       device->card->generation,
+                       request.generation,
                        device->node->max_speed,
                        request.offset,
                        response->response.data, request.length,

diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
index 0cc4b082257f9994f0ba58bf48fefdbfe7c03852..f1c4b74eb09ba80b86905bed2c0301a7ebc3eea6 100644 (file)
--- a/drivers/firewire/fw-device-cdev.h
+++ b/drivers/firewire/fw-device-cdev.h
@@ -151,6 +151,7 @@ struct fw_cdev_send_request {
        __u64 offset;
        __u64 closure;
        __u64 data;
+       __u32 generation;
 };
 
 struct fw_cdev_send_response {