The patch titled
ieee1394: skip dummy loop in build_speed_map
has been removed from the -mm tree. Its filename is
ieee1394-skip-dummy-loop-in-build_speed_map.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: skip dummy loop in build_speed_map
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/ieee1394.h | 2 ++
drivers/ieee1394/ieee1394_core.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff -puN drivers/ieee1394/ieee1394_core.c~ieee1394-skip-dummy-loop-in-build_speed_map drivers/ieee1394/ieee1394_core.c
--- a/drivers/ieee1394/ieee1394_core.c~ieee1394-skip-dummy-loop-in-build_speed_map
+++ a/drivers/ieee1394/ieee1394_core.c
@@ -355,10 +355,12 @@ static void build_speed_map(struct hpsb_
}
}
+#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
}
diff -puN drivers/ieee1394/ieee1394.h~ieee1394-skip-dummy-loop-in-build_speed_map drivers/ieee1394/ieee1394.h
--- a/drivers/ieee1394/ieee1394.h~ieee1394-skip-dummy-loop-in-build_speed_map
+++ a/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
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
