Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

[pandora-kernel.git] / arch / um / os-Linux / drivers / ethertap_kern.c

diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
index 768606b..1268914 100644 (file)
--- a/arch/um/os-Linux/drivers/ethertap_kern.c
+++ b/arch/um/os-Linux/drivers/ethertap_kern.c
@@ -43,7 +43,7 @@ static int etap_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 
        *skb = ether_adjust_skb(*skb, ETH_HEADER_ETHERTAP);
        if(*skb == NULL) return(-ENOMEM);
-       len = net_recvfrom(fd, (*skb)->mac.raw, 
+       len = net_recvfrom(fd, skb_mac_header(*skb),
                           (*skb)->dev->mtu + 2 * ETH_HEADER_ETHERTAP);
        if(len <= 0) return(len);
        skb_pull(*skb, 2);
@@ -65,7 +65,7 @@ static int etap_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
        return(net_send(fd, (*skb)->data, (*skb)->len));
 }
 
-struct net_kern_info ethertap_kern_info = {
+const struct net_kern_info ethertap_kern_info = {
        .init                   = etap_init,
        .protocol               = eth_protocol,
        .read                   = etap_read,
@@ -105,4 +105,4 @@ static int register_ethertap(void)
        return 0;
 }
 
-__initcall(register_ethertap);
+late_initcall(register_ethertap);