summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2009-03-10 20:59:16 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2009-03-24 20:56:49 +0100
commitc8a25900f35e575938c791507894c036c0f2ca7d (patch)
treee413f9e098dea94c74fd0aab35a511800043c97b /drivers/firewire
parent6104ee92d62ea3638b67494fcf061cb4b9b9d518 (diff)
downloadop-kernel-dev-c8a25900f35e575938c791507894c036c0f2ca7d.zip
op-kernel-dev-c8a25900f35e575938c791507894c036c0f2ca7d.tar.gz
firewire: cdev: amendment to "add ioctl to query maximum transmission speed"
The as yet unreleased FW_CDEV_IOC_GET_SPEED ioctl puts only a single integer into the parameter buffer. We can use ioctl()'s return value instead. (Also: Some whitespace change in firewire-cdev.h.) Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-cdev.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index 539dae5..2784f91 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -1214,13 +1214,14 @@ static int ioctl_deallocate_iso_resource_once(struct client *client, void *buffe
return init_iso_resource(client, request, ISO_RES_DEALLOC_ONCE);
}
+/*
+ * Returns a speed code: Maximum speed to or from this device,
+ * limited by the device's link speed, the local node's link speed,
+ * and all PHY port speeds between the two links.
+ */
static int ioctl_get_speed(struct client *client, void *buffer)
{
- struct fw_cdev_get_speed *request = buffer;
-
- request->max_speed = client->device->max_speed;
-
- return 0;
+ return client->device->max_speed;
}
static int ioctl_send_broadcast_request(struct client *client, void *buffer)
OpenPOWER on IntegriCloud