Pull fsys_gettimeofday into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / appletalk / ltpc.c

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 2ea44ce4981064ed0589918a9b1ded3a45a7d793..fef5560bc7a2ee2d8c6aee66f6e413022fdfdca1 100644 (file)
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -770,13 +770,13 @@ static int sendup_buffer (struct net_device *dev)
        skb->data[0] = dnode;
        skb->data[1] = snode;
        skb->data[2] = llaptype;
-       skb->mac.raw = skb->data;       /* save pointer to llap header */
+       skb_reset_mac_header(skb);      /* save pointer to llap header */
        skb_pull(skb,3);
 
        /* copy ddp(s,e)hdr + contents */
-       memcpy(skb->data,(void*)ltdmabuf,len);
+       skb_copy_to_linear_data(skb, ltdmabuf, len);
 
-       skb->h.raw = skb->data;
+       skb_reset_transport_header(skb);
 
        stats->rx_packets++;
        stats->rx_bytes+=skb->len;
@@ -870,15 +870,6 @@ static void set_multicast_list(struct net_device *dev)
        /* Actually netatalk needs fixing! */
 }
 
-static int ltpc_hard_header (struct sk_buff *skb, struct net_device *dev, 
-       unsigned short type, void *daddr, void *saddr, unsigned len)
-{
-       if(debug & DEBUG_VERBOSE)
-               printk("ltpc_hard_header called for device %s\n",
-                       dev->name);
-       return 0;
-}
-
 static int ltpc_poll_counter;
 
 static void ltpc_poll(unsigned long l)
@@ -917,13 +908,14 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
 
        int i;
        struct lt_sendlap cbuf;
+       unsigned char *hdr;
 
        cbuf.command = LT_SENDLAP;
        cbuf.dnode = skb->data[0];
        cbuf.laptype = skb->data[2];
        skb_pull(skb,3);        /* skip past LLAP header */
        cbuf.length = skb->len; /* this is host order */
-       skb->h.raw=skb->data;
+       skb_reset_transport_header(skb);
 
        if(debug & DEBUG_UPPER) {
                printk("command ");
@@ -932,11 +924,13 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
                printk("\n");
        }
 
-       do_write(dev,&cbuf,sizeof(cbuf),skb->h.raw,skb->len);
+       hdr = skb_transport_header(skb);
+       do_write(dev, &cbuf, sizeof(cbuf), hdr, skb->len);
 
        if(debug & DEBUG_UPPER) {
                printk("sent %d ddp bytes\n",skb->len);
-               for(i=0;i<skb->len;i++) printk("%02x ",skb->h.raw[i]);
+               for (i = 0; i < skb->len; i++)
+                       printk("%02x ", hdr[i]);
                printk("\n");
        }
 
@@ -1043,8 +1037,6 @@ struct net_device * __init ltpc_probe(void)
        if (!dev)
                goto out;
 
-       SET_MODULE_OWNER(dev);
-
        /* probe for the I/O port address */
        
        if (io != 0x240 && request_region(0x220,8,"ltpc")) {
@@ -1140,7 +1132,6 @@ struct net_device * __init ltpc_probe(void)
 
        /* Fill in the fields of the device structure with ethernet-generic values. */
        dev->hard_start_xmit = ltpc_xmit;
-       dev->hard_header = ltpc_hard_header;
        dev->get_stats = ltpc_get_stats;
 
        /* add the ltpc-specific things */
@@ -1261,7 +1252,7 @@ module_param(irq, int, 0);
 module_param(dma, int, 0);
 
 
-int __init init_module(void)
+static int __init ltpc_module_init(void)
 {
         if(io == 0)
                printk(KERN_NOTICE
@@ -1272,6 +1263,7 @@ int __init init_module(void)
                return PTR_ERR(dev_ltpc);
        return 0;
 }
+module_init(ltpc_module_init);
 #endif
 
 static void __exit ltpc_cleanup(void)