diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-01-23 21:11:43 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 22:02:43 +0100 |
| commit | 907293d78872ee492ce6a114258dd853ec5082ae (patch) | |
| tree | 9384ac58621706b7d3846b34944fa5475f084502 /drivers/firewire/fw-topology.c | |
| parent | 366f5f4fa31cd3f3d5901f5edfe255a48906505d (diff) | |
| download | blackbird-op-linux-907293d78872ee492ce6a114258dd853ec5082ae.tar.gz blackbird-op-linux-907293d78872ee492ce6a114258dd853ec5082ae.zip | |
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>
Diffstat (limited to 'drivers/firewire/fw-topology.c')
| -rw-r--r-- | drivers/firewire/fw-topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c index 1938f36cfaa3..684d87d99775 100644 --- a/drivers/firewire/fw-topology.c +++ b/drivers/firewire/fw-topology.c @@ -102,7 +102,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color) return NULL; node->color = color; - node->node_id = self_id_phy_id(sid); + node->node_id = LOCAL_BUS | self_id_phy_id(sid); node->link_on = self_id_link_on(sid); node->phy_speed = self_id_phy_speed(sid); node->port_count = port_count; |
