From: Stefan Richter Date: Tue, 23 Jan 2007 20:11:43 +0000 (+0100) Subject: firewire: consistent usage of node_id X-Git-Tag: v2.6.22-rc1~111^2~116 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=907293d78872ee492ce6a114258dd853ec5082ae;p=pandora-kernel.git firewire: consistent usage of node_id Definitions as per IEEE 1212 and IEEE 1394: Node ID: Concatenation of bus ID and local ID. 16 bits long. Bus ID: Identifies a particular bus within a group of buses interconnected by bus bridges. Local ID: Identifies a particular node on a bus. PHY ID: Local ID of IEEE 1394 nodes. 6 bits long. Never ever use a variable called node_id for anything else than a node ID. Signed-off-by: Stefan Richter --- diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c index 5ffc58c6624c..1b9e5f7c0129 100644 --- a/drivers/firewire/fw-device-cdev.c +++ b/drivers/firewire/fw-device-cdev.c @@ -238,7 +238,7 @@ static ssize_t ioctl_send_request(struct client *client, void __user *arg) fw_send_request(device->card, &response->transaction, request.tcode, - device->node->node_id | LOCAL_BUS, + device->node->node_id, device->card->generation, device->node->max_speed, request.offset, Reading git-diff-tree failed