From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 24 Nov 2006 01:56:20 +0000 (+0100)
Subject: [IPX]: Correct return type of ipx_map_frame_type().
X-Git-Tag: v2.6.16.34-rc1~21
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=a06ee75aa0005026f27609e7b656ca738b5153d8;p=unionfs-2.6.25.y.git

[IPX]: Correct return type of ipx_map_frame_type().

Casting BE16 to int and back may or may not work. Correct, to be sure.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 0fb513a34d1..2b72248022d 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -944,9 +944,9 @@ out:
 	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;