From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 7 Mar 2007 17:12:53 +0000 (-0500)
Subject: firewire: Add generation field to send_request ioctl struct.
X-Git-Tag: v2.6.22-rc1~111^2~55
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97e352753820c62fca6d46723e0591e1ff6a3b22;p=linux-2.6

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 68428d013d..7b0efccf78 100644
--- 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 0cc4b08225..f1c4b74eb0 100644
--- 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 {