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
/
ipv4
/
ipconfig.c
diff --git
a/net/ipv4/ipconfig.c
b/net/ipv4/ipconfig.c
index
1fbb384
..
1b5d039
100644
(file)
--- a/
net/ipv4/ipconfig.c
+++ b/
net/ipv4/ipconfig.c
@@
-31,6
+31,7
@@
* -- Josef Siemes <jsiemes@web.de>, Aug 2002
*/
* -- Josef Siemes <jsiemes@web.de>, Aug 2002
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
@@
-185,7
+186,7
@@
static int __init ic_open_devs(void)
unsigned short oflags;
last = &ic_first_dev;
unsigned short oflags;
last = &ic_first_dev;
- rtnl_lock();
+ rtnl_
sh
lock();
/* bring loopback device up first */
if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
/* bring loopback device up first */
if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
@@
-214,7
+215,7
@@
static int __init ic_open_devs(void)
continue;
}
if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) {
continue;
}
if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) {
- rtnl_unlock();
+ rtnl_
sh
unlock();
return -1;
}
d->dev = dev;
return -1;
}
d->dev = dev;
@@
-231,7
+232,7
@@
static int __init ic_open_devs(void)
dev->name, able, d->xid));
}
}
dev->name, able, d->xid));
}
}
- rtnl_unlock();
+ rtnl_
sh
unlock();
*last = NULL;
*last = NULL;
@@
-250,7
+251,7
@@
static void __init ic_close_devs(void)
struct ic_device *d, *next;
struct net_device *dev;
struct ic_device *d, *next;
struct net_device *dev;
- rtnl_lock();
+ rtnl_
sh
lock();
next = ic_first_dev;
while ((d = next)) {
next = d->next;
next = ic_first_dev;
while ((d = next)) {
next = d->next;
@@
-261,7
+262,7
@@
static void __init ic_close_devs(void)
}
kfree(d);
}
}
kfree(d);
}
- rtnl_unlock();
+ rtnl_
sh
unlock();
}
/*
}
/*
@@
-420,7
+421,7
@@
ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
{
struct arphdr *rarp;
unsigned char *rarp_ptr;
{
struct arphdr *rarp;
unsigned char *rarp_ptr;
- u
nsigned long
sip, tip;
+ u
32
sip, tip;
unsigned char *sha, *tha; /* s for "source", t for "target" */
struct ic_device *d;
unsigned char *sha, *tha; /* s for "source", t for "target" */
struct ic_device *d;