From: Peter Hurley <peter@hurleysoftware.com>
Date: Tue, 29 Jan 2013 01:57:46 +0000 (-0500)
Subject: staging/fwserial: Simplify max payload calculation
X-Git-Tag: firefly_0821_release~3680^2~1080^2~225
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d83561894db22ee9c40fdd85d49eb5ee573125cc;p=firefly-linux-kernel-4.4.55.git

staging/fwserial: Simplify max payload calculation

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/fwserial/fwserial.h b/drivers/staging/fwserial/fwserial.h
index e157318cb7da..953ece69c10d 100644
--- a/drivers/staging/fwserial/fwserial.h
+++ b/drivers/staging/fwserial/fwserial.h
@@ -377,8 +377,8 @@ static inline void fwtty_bind_console(struct fwtty_port *port,
  */
 static inline int link_speed_to_max_payload(unsigned speed)
 {
-	speed = clamp(speed, (unsigned) SCODE_100, (unsigned) SCODE_800);
-	return 1 << (speed + 9);
+	/* Max async payload is 4096 - see IEEE 1394-2008 tables 6-4, 16-18 */
+	return min(512 << speed, 4096);
 }
 
 #endif /* _FIREWIRE_FWSERIAL_H */