summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-01-06 13:24:54 -0800
committerDavid S. Miller <davem@davemloft.net>2006-01-06 13:24:54 -0800
commita2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (patch)
treec6f2a4206952e51f765f3e7ef84892746579501c
parent76ab608d86cf1ef5c5c46819b5733eb9f9f964f8 (diff)
downloadlinux-3.10-a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c.tar.gz
linux-3.10-a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c.tar.bz2
linux-3.10-a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c.zip
[NET]: Endian-annotate in_aton()
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/inet.h2
-rw-r--r--net/core/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h
index 3b5e9fdff87..6c5587af118 100644
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -45,6 +45,6 @@
#ifdef __KERNEL__
#include <linux/types.h>
-extern __u32 in_aton(const char *str);
+extern __be32 in_aton(const char *str);
#endif
#endif /* _LINUX_INET_H */
diff --git a/net/core/utils.c b/net/core/utils.c
index 587eb7787de..ac1d1fcf867 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(net_srandom);
* is otherwise not dependent on the TCP/IP stack.
*/
-__u32 in_aton(const char *str)
+__be32 in_aton(const char *str)
{
unsigned long l;
unsigned int val;