From b01f0dd78580c0da916cfe04ebee2a4f805d8adf Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 19 May 2008 13:29:06 -0700
Subject: [PATCH] --- yaml --- r: 102591 b: refs/heads/master c:
 fc5ad582709ce9c7b9ab7b70c1e5b5e2cfc384db h: refs/heads/master i:   102589:
 629f805594f9f9f40102e79cbd5c6707de188b78   102587:
 705b9b14684083e1a96f1c06e389ffa2093b2ad2   102583:
 e5cb8740d144eca663394f2c0860a280fbbb7b90   102575:
 dce18087c105fc05ac17ddfd66eb17da9912891a   102559:
 a11e72854ae6255514748bee6607285d90729fa8   102527:
 a7629c9772574e0593aaf60d16490f5172fa653e v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/subscr.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5d27802b3613..801893987e01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9501f5188d90eed737240453c32cad01849c96
+refs/heads/master: fc5ad582709ce9c7b9ab7b70c1e5b5e2cfc384db
diff --git a/trunk/net/tipc/subscr.c b/trunk/net/tipc/subscr.c
index a62e5d30638c..dde23f1e7542 100644
--- a/trunk/net/tipc/subscr.c
+++ b/trunk/net/tipc/subscr.c
@@ -86,9 +86,7 @@ static struct top_srv topsrv = { 0 };
 
 static u32 htohl(u32 in, int swap)
 {
-	char *c = (char *)&in;
-
-	return swap ? ((c[3] << 3) + (c[2] << 2) + (c[1] << 1) + c[0]) : in;
+	return swap ? (u32)___constant_swab32(in) : in;
 }
 
 /**