uml: fix previous request size limit fix

[linux-2.6] / arch / um / drivers / daemon_kern.c

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index 53d09ed78b425391c3e118f998fcd0f89a146691..adeece11e596a445637cbaf84088b3ebbc5ab9a2 100644 (file)
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -46,7 +46,7 @@ static int daemon_read(int fd, struct sk_buff **skb,
 {
        *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
        if(*skb == NULL) return(-ENOMEM);
-       return(net_recvfrom(fd, (*skb)->mac.raw, 
+       return(net_recvfrom(fd, skb_mac_header(*skb),
                            (*skb)->dev->mtu + ETH_HEADER_OTHER));
 }
 
@@ -57,7 +57,7 @@ static int daemon_write(int fd, struct sk_buff **skb,
                                 (struct daemon_data *) &lp->user));
 }
 
-static struct net_kern_info daemon_kern_info = {
+static const struct net_kern_info daemon_kern_info = {
        .init                   = daemon_init,
        .protocol               = eth_protocol,
        .read                   = daemon_read,
@@ -98,4 +98,4 @@ static int register_daemon(void)
        return 0;
 }
 
-__initcall(register_daemon);
+late_initcall(register_daemon);