git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
decnet
/
sysctl_net_decnet.c
diff --git
a/net/decnet/sysctl_net_decnet.c
b/net/decnet/sysctl_net_decnet.c
index
e246f05
..
0e9d2c5
100644
(file)
--- a/
net/decnet/sysctl_net_decnet.c
+++ b/
net/decnet/sysctl_net_decnet.c
@@
-13,6
+13,7
@@
* Steve Whitehouse - Memory buffer settings, like the tcp ones
*
*/
* Steve Whitehouse - Memory buffer settings, like the tcp ones
*
*/
+#include <linux/config.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <linux/fs.h>
@@
-85,9
+86,9
@@
static void strip_it(char *str)
* Simple routine to parse an ascii DECnet address
* into a network order address.
*/
* Simple routine to parse an ascii DECnet address
* into a network order address.
*/
-static int parse_addr(
__le16
*addr, char *str)
+static int parse_addr(
dn_address
*addr, char *str)
{
{
-
__u16
area, node;
+
dn_address
area, node;
while(*str && !ISNUM(*str)) str++;
while(*str && !ISNUM(*str)) str++;
@@
-138,7
+139,7
@@
static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen
void **context)
{
size_t len;
void **context)
{
size_t len;
-
__le16
addr;
+
dn_address
addr;
if (oldval && oldlenp) {
if (get_user(len, oldlenp))
if (oldval && oldlenp) {
if (get_user(len, oldlenp))
@@
-146,14
+147,14
@@
static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen
if (len) {
if (len != sizeof(unsigned short))
return -EINVAL;
if (len) {
if (len != sizeof(unsigned short))
return -EINVAL;
- if (put_user(decnet_address, (
__le16
__user *)oldval))
+ if (put_user(decnet_address, (
unsigned short
__user *)oldval))
return -EFAULT;
}
}
if (newval && newlen) {
if (newlen != sizeof(unsigned short))
return -EINVAL;
return -EFAULT;
}
}
if (newval && newlen) {
if (newlen != sizeof(unsigned short))
return -EINVAL;
- if (get_user(addr, (
__le16
__user *)newval))
+ if (get_user(addr, (
unsigned short
__user *)newval))
return -EFAULT;
dn_dev_devices_off();
return -EFAULT;
dn_dev_devices_off();
@@
-172,7
+173,7
@@
static int dn_node_address_handler(ctl_table *table, int write,
{
char addr[DN_ASCBUF_LEN];
size_t len;
{
char addr[DN_ASCBUF_LEN];
size_t len;
-
__le16
dnaddr;
+
dn_address
dnaddr;
if (!*lenp || (*ppos && !write)) {
*lenp = 0;
if (!*lenp || (*ppos && !write)) {
*lenp = 0;