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]
/
arch
/
um
/
drivers
/
daemon_kern.c
diff --git
a/arch/um/drivers/daemon_kern.c
b/arch/um/drivers/daemon_kern.c
index
30d285b
..
a61b7b4
100644
(file)
--- a/
arch/um/drivers/daemon_kern.c
+++ b/
arch/um/drivers/daemon_kern.c
@@
-18,7
+18,7
@@
struct daemon_init {
char *ctl_sock;
};
char *ctl_sock;
};
-void daemon_init(struct net_device *dev, void *data)
+
static
void daemon_init(struct net_device *dev, void *data)
{
struct uml_net_private *pri;
struct daemon_data *dpri;
{
struct uml_net_private *pri;
struct daemon_data *dpri;
@@
-31,6
+31,10
@@
void daemon_init(struct net_device *dev, void *data)
dpri->fd = -1;
dpri->control = -1;
dpri->dev = dev;
dpri->fd = -1;
dpri->control = -1;
dpri->dev = dev;
+ /* We will free this pointer. If it contains crap we're burned. */
+ dpri->ctl_addr = NULL;
+ dpri->data_addr = NULL;
+ dpri->local_addr = NULL;
printk("daemon backend (uml_switch version %d) - %s:%s",
SWITCH_VERSION, dpri->sock_type, dpri->ctl_sock);
printk("daemon backend (uml_switch version %d) - %s:%s",
SWITCH_VERSION, dpri->sock_type, dpri->ctl_sock);
@@
-60,7
+64,7
@@
static struct net_kern_info daemon_kern_info = {
.write = daemon_write,
};
.write = daemon_write,
};
-int daemon_setup(char *str, char **mac_out, void *data)
+
static
int daemon_setup(char *str, char **mac_out, void *data)
{
struct daemon_init *init = data;
char *remain;
{
struct daemon_init *init = data;
char *remain;