Commit 433a87d5 authored by Stefan Richter's avatar Stefan Richter Committed by Ben Collins
Browse files

[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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
parent f0cbefe6

drivers/ieee1394/ieee1394.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/ieee1394/ieee1394_core.c

+3 −1
Original line number Diff line number Diff line
@@ -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

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE