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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
um
/
drivers
/
slirp_user.c
diff --git
a/arch/um/drivers/slirp_user.c
b/arch/um/drivers/slirp_user.c
index
b94c661
..
ce5e85d
100644
(file)
--- a/
arch/um/drivers/slirp_user.c
+++ b/
arch/um/drivers/slirp_user.c
@@
-104,7
+104,7
@@
static void slirp_close(int fd, void *data)
}
if(err == 0) {
}
if(err == 0) {
- printk("slirp_close: process %d has not exited\n");
+ printk("slirp_close: process %d has not exited\n"
, pri->pid
);
return;
}
return;
}
@@
-126,7
+126,7
@@
static int slirp_set_mtu(int mtu, void *data)
return(mtu);
}
return(mtu);
}
-struct net_user_info slirp_user_info = {
+
const
struct net_user_info slirp_user_info = {
.init = slirp_user_init,
.open = slirp_open,
.close = slirp_close,
.init = slirp_user_init,
.open = slirp_open,
.close = slirp_close,