projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
drivers
/
slip_kern.c
diff --git
a/arch/um/drivers/slip_kern.c
b/arch/um/drivers/slip_kern.c
index 163ee0d5f75e4e165c312a47b02d2af8975f4be9..125c44f776383bf5ec024277793af182acb7385b 100644
(file)
--- a/
arch/um/drivers/slip_kern.c
+++ b/
arch/um/drivers/slip_kern.c
@@
-1,4
+1,3
@@
-#include "linux/config.h"
#include "linux/kernel.h"
#include "linux/stddef.h"
#include "linux/init.h"
#include "linux/kernel.h"
#include "linux/stddef.h"
#include "linux/init.h"
@@
-50,7
+49,7
@@
static unsigned short slip_protocol(struct sk_buff *skbuff)
static int slip_read(int fd, struct sk_buff **skb,
struct uml_net_private *lp)
{
static int slip_read(int fd, struct sk_buff **skb,
struct uml_net_private *lp)
{
- return(slip_user_read(fd,
(*skb)->mac.raw, (*skb)->dev->mtu,
+ return(slip_user_read(fd,
skb_mac_header(*skb), (*skb)->dev->mtu,
(struct slip_data *) &lp->user));
}
(struct slip_data *) &lp->user));
}
@@
-61,7
+60,7
@@
static int slip_write(int fd, struct sk_buff **skb,
(struct slip_data *) &lp->user));
}
(struct slip_data *) &lp->user));
}
-struct net_kern_info slip_kern_info = {
+
const
struct net_kern_info slip_kern_info = {
.init = slip_init,
.protocol = slip_protocol,
.read = slip_read,
.init = slip_init,
.protocol = slip_protocol,
.read = slip_read,
@@
-96,4
+95,4
@@
static int register_slip(void)
return 0;
}
return 0;
}
-
_
_initcall(register_slip);
+
late
_initcall(register_slip);