summaryrefslogtreecommitdiffstats
path: root/net/ipx
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-05-16 15:17:49 -0700
committerDavid S. Miller <davem@davemloft.net>2006-05-16 15:17:49 -0700
commit4ac396c0467993853d3d58c0975151515700c07b (patch)
treefb52e9578201b027ffba0292199c9acd2c4720d8 /net/ipx
parent53d42f541278b6c97724465b19bae4730d7a85c8 (diff)
downloadlinux-stable-4ac396c0467993853d3d58c0975151515700c07b.tar.gz
linux-stable-4ac396c0467993853d3d58c0975151515700c07b.tar.bz2
linux-stable-4ac396c0467993853d3d58c0975151515700c07b.zip
[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>
Diffstat (limited to 'net/ipx')
-rw-r--r--net/ipx/af_ipx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 2dbf134d5266..811d998725bc 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;