Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / arch / um / drivers / slirp_kern.c

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index ae322e1..0a0324a 100644 (file)
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -53,7 +53,7 @@ static unsigned short slirp_protocol(struct sk_buff *skbuff)
 static int slirp_read(int fd, struct sk_buff **skb, 
                       struct uml_net_private *lp)
 {
-       return(slirp_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu, 
+       return(slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
                              (struct slirp_data *) &lp->user));
 }
 
@@ -119,4 +119,4 @@ static int register_slirp(void)
        return 0;
 }
 
-__initcall(register_slirp);
+late_initcall(register_slirp);