diff --git a/[refs] b/[refs]
index 0a981bf7eb5d..beccb430a325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53d42f541278b6c97724465b19bae4730d7a85c8
+refs/heads/master: 4ac396c0467993853d3d58c0975151515700c07b
diff --git a/trunk/net/ipx/af_ipx.c b/trunk/net/ipx/af_ipx.c
index 2dbf134d5266..811d998725bc 100644
--- a/trunk/net/ipx/af_ipx.c
+++ b/trunk/net/ipx/af_ipx.c
@@ -944,9 +944,9 @@ static int ipxitf_create_internal(struct ipx_interface_definition *idef)
 	return rc;
 }
 
-static int ipx_map_frame_type(unsigned char type)
+static __be16 ipx_map_frame_type(unsigned char type)
 {
-	int rc = 0;
+	__be16 rc = 0;
 
 	switch (type) {
 	case IPX_FRAME_ETHERII:	rc = htons(ETH_P_IPX);		break;