summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-03-07 12:12:53 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-09 22:03:13 +0100
commit97e352753820c62fca6d46723e0591e1ff6a3b22 (patch)
treeef00cf3472f6e746d8d2347760188a8abc57588b
parente7533505fed97379b03538cf0ff2df0dc853298f (diff)
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>
-rw-r--r--drivers/firewire/fw-device-cdev.c2
-rw-r--r--drivers/firewire/fw-device-cdev.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
index 68428d013d8d..7b0efccf78f1 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 0cc4b082257f..f1c4b74eb09b 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 {