Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16669
b: refs/heads/master
c: a2167dc
h: refs/heads/master
i:
  16667: 151e156
v: v3
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed Jan 6, 2006
1 parent 0629bd5 commit 0646765
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76ab608d86cf1ef5c5c46819b5733eb9f9f964f8
refs/heads/master: a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c
2 changes: 1 addition & 1 deletion trunk/include/linux/inet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
2 changes: 1 addition & 1 deletion trunk/net/core/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0646765

Please sign in to comment.