--- a/devolo_usb.c	2007-08-30 01:51:53.000000000 -0700
+++ b/devolo_usb.c	2008-08-26 14:08:21.000000000 -0700
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/ethtool.h>
 #include <asm/uaccess.h>
-#include <linux/config.h>
 #include <linux/kmod.h>
 #include <linux/random.h>
 #include <asm/unaligned.h>
@@ -40,11 +39,7 @@
   {},	       
 };
 
-#if defined(MODULE_LICENSE)
-MODULE_LICENSE ("devolo AG");
-#endif
-
-
+MODULE_LICENSE ("GPL");
 MODULE_AUTHOR (DRIVER_AUTHOR);
 MODULE_DESCRIPTION (DRIVER_DESC);
 MODULE_DEVICE_TABLE (usb, plUsb_ids);
@@ -132,7 +127,7 @@
 
   skb->dev = net;
 
-  eth_copy_and_sum (skb, devolo->rx_buff, count, 0);
+  memcpy(skb->data, devolo->rx_buff, count);
   /* bug 1180*/
   skb_put (skb, count-2);
 
@@ -150,9 +145,9 @@
   devolo->stats.rx_bytes += count;
 
  goon:
-  FILL_BULK_URB (devolo->rx_urb, devolo->usb,
+  usb_fill_bulk_urb (devolo->rx_urb, devolo->usb,
 		 usb_rcvbulkpipe (devolo->usb, 1), devolo->rx_buff,
-		 DEVOLO_MAX_MTU, devolo_read_bulk_callback, devolo);
+		 DEVOLO_MAX_MTU, (usb_complete_t)devolo_read_bulk_callback, devolo);
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
   if ((res = usb_submit_urb (devolo->rx_urb,GFP_ATOMIC)))
 #else
@@ -246,9 +241,9 @@
   ((unsigned char *) devolo->tx_buff)[1] = (l16 & 0x700) >> 8;
   memcpy (devolo->tx_buff+2, skb->data, skb->len);
  
-  FILL_BULK_URB (devolo->tx_urb, devolo->usb,
+  usb_fill_bulk_urb (devolo->tx_urb, devolo->usb,
 		 usb_sndbulkpipe (devolo->usb, 2), devolo->tx_buff,
-		 count, devolo_write_bulk_callback, devolo);
+		 count, (usb_complete_t)devolo_write_bulk_callback, devolo);
 
   /*
    *  Submit urb and update stats
@@ -355,10 +350,10 @@
   // set_ethernet_addr(devolo);
 
   devolo->flags &= ~DEVOLO_RX_BUSY;
-  FILL_BULK_URB (devolo->rx_urb, devolo->usb,
+  usb_fill_bulk_urb(devolo->rx_urb, devolo->usb,
 		 usb_rcvbulkpipe (devolo->usb, 1),
 		 devolo->rx_buff, DEVOLO_MAX_MTU,
-		 devolo_read_bulk_callback,devolo); 
+		 (usb_complete_t)devolo_read_bulk_callback,devolo);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
   if ((res = usb_submit_urb (devolo->rx_urb,GFP_KERNEL/*GFP_ATOMIC??*/)))
@@ -639,7 +634,6 @@
   ether_setup (net);
   devolo->usb = dev;
   devolo->net = net;
-  SET_MODULE_OWNER (net);
   net->priv = devolo;
   net->open = devolo_open;
   net->stop = devolo_close;