diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-07-03 12:02:27 -0400 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-07-03 12:02:27 -0400 |
| commit | 433a87d528f685028b6f61fc3d7fae07ed915aa8 (patch) | |
| tree | 6dde8ae1b1fbe199b8a41c2e54e95bed427c61c5 /drivers | |
| parent | f0cbefe63c4347044fffebca24c03f3c6829f322 (diff) | |
| download | linux-433a87d528f685028b6f61fc3d7fae07ed915aa8.tar.bz2 | |
[PATCH] ieee1394: skip dummy loop in build_speed_map
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee1394/ieee1394.h | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ieee1394/ieee1394.h b/drivers/ieee1394/ieee1394.h index 936d776de00a..d911abe3a35e 100644 --- a/drivers/ieee1394/ieee1394.h +++ b/drivers/ieee1394/ieee1394.h @@ -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 diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index f43739c5cab2..559c477092f8 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c @@ -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 } |