Skip to content

Commit

Permalink
[PATCH] ieee1394: skip dummy loop in build_speed_map
Browse files Browse the repository at this point in the history
The last loop in ieee1394 core's speed calculation is not required
unless ieee1394.h::IEEE1394_SPEED_MAX is changed from its current value
of 3.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
  • Loading branch information
Stefan Richter authored and Ben Collins committed Jul 3, 2006
1 parent f0cbefe commit 433a87d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/ieee1394/ieee1394.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ extern const char *hpsb_speedto_str[];
#define SELFID_PORT_NCONN 0x1
#define SELFID_PORT_NONE 0x0

#define SELFID_SPEED_UNKNOWN 0x3 /* 1394b PHY */

#define PHYPACKET_LINKON 0x40000000
#define PHYPACKET_PHYCONFIG_R 0x00800000
#define PHYPACKET_PHYCONFIG_T 0x00400000
Expand Down
4 changes: 3 additions & 1 deletion drivers/ieee1394/ieee1394_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,12 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)
}
}

#if SELFID_SPEED_UNKNOWN != IEEE1394_SPEED_MAX
/* assume maximum speed for 1394b PHYs, nodemgr will correct it */
for (n = 0; n < nodecount; n++)
if (speedcap[n] == 3)
if (speedcap[n] == SELFID_SPEED_UNKNOWN)
speedcap[n] = IEEE1394_SPEED_MAX;
#endif
}


Expand Down

0 comments on commit 433a87d

Please sign in to comment.