The patch titled
ieee1394: skip dummy loop in build_speed_map
has been added to the -mm tree. Its filename is
ieee1394-skip-dummy-loop-in-build_speed_map.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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
irq-flags-consolidate-flags-for-request_irq.patch
irq-flags-firewire-use-the-new-irqf_-constansts.patch
lockdep-annotate-ieee1394-skb-queue-head-locking.patch
ieee1394-sbp2-enable-auto-spin-up-for-maxtor-disks.patch
ieee1394-fix-calculation-of-csr-expire.patch
ieee1394-fix-cosmetic-problem-in-speed-probe.patch
ieee1394-skip-dummy-loop-in-build_speed_map.patch
ieee1394-replace-__inline__-by-inline.patch
ieee1394-coding-style-and-comment-fixes-in-midlayer.patch
ieee1394-update-include-directives-in-midlayer-header.patch
ieee1394-remove-redundant-code-from-ieee1394_hotplugh.patch
ieee1394-remove-unused-macros-hpsb_panic-and.patch
ieee1394-clean-up-declarations-of-hpsb__config_rom.patch
ieee1394-dv1394-sem2mutex-conversion.patch
ieee1394-raw1394-remove-redundant-counting-semaphore.patch
ieee1394-nodemgr-remove-unnecessary-includes.patch
ieee1394-nodemgr-do-not-spawn-kernel_thread-for-sysfs.patch
ieee1394-nodemgr-make-module-parameter-ignore_drivers.patch
ieee1394-nodemgr-switch-to-kthread-api-replace-reset.patch
ieee1394-nodemgr-convert-nodemgr_serialize-semaphore.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
