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 <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
index 5ffc58c6624cc01d66c83b8042a4ab29930e2f2a..1b9e5f7c012982c38e028f4489d180627b3fea53 100644 (file)
--- 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,

diff --cc drivers/firewire/fw-device.c
Simple merge

diff --cc drivers/firewire/fw-ohci.c
Simple merge

diff --cc drivers/firewire/fw-sbp2.c
Simple merge

diff --cc drivers/firewire/fw-topology.c
Simple merge

diff --cc drivers/firewire/fw-transaction.c
Simple merge