Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / um / os-Linux / drivers / tuntap_kern.c

diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c
index 0edbac63c52708009ac792442fee6eb75dc2fbb5..f1714e7fb1d0ed3d49849804fdc04cc42c84dfbb 100644 (file)
--- a/arch/um/os-Linux/drivers/tuntap_kern.c
+++ b/arch/um/os-Linux/drivers/tuntap_kern.c
@@ -43,7 +43,7 @@ static int tuntap_read(int fd, struct sk_buff **skb,
 {
        *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
        if(*skb == NULL) return(-ENOMEM);
-       return(net_read(fd, (*skb)->mac.raw, 
+       return(net_read(fd, skb_mac_header(*skb),
                        (*skb)->dev->mtu + ETH_HEADER_OTHER));
 }
 
@@ -90,4 +90,4 @@ static int register_tuntap(void)
        return 0;
 }
 
-__initcall(register_tuntap);
+late_initcall(register_tuntap);