6 files changed, 319 insertions, 46 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 8ee21030e9ac..e00b5b1f6743 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -345,4 +345,12 @@ config USB_HSO
           To compile this driver as a module, choose M here: the
           module will be called hso.
 
+config USB_NET_INT51X1
+        tristate "Intellon PLC based usb adapter"
+        depends on USB_USBNET
+        help
+          Choose this option if you're using a 14Mb USB-based PLC
+          (Powerline Communications) solution with an Intellon
+          INT51x1/INT5200 chip, like the "devolo dLan duo".
+
 endmenu
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index 88a87eeb376a..f4402a06e52c 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -19,4 +19,5 @@ obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
 obj-$(CONFIG_USB_NET_ZAURUS)    += zaurus.o
 obj-$(CONFIG_USB_NET_MCS7830)   += mcs7830.o
 obj-$(CONFIG_USB_USBNET)        += usbnet.o
+obj-$(CONFIG_USB_NET_INT51X1)   += int51x1.o
 
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 55e8ecc3a9e5..01fd528306ec 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -25,7 +25,6 @@
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ctype.h>
 #include <linux/ethtool.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
@@ -389,36 +388,6 @@ static void cdc_status(struct usbnet *dev, struct urb *urb)
         }
 }
 
-static u8 nibble(unsigned char c)
-{
-        if (likely(isdigit(c)))
-                return c - '0';
-        c = toupper(c);
-        if (likely(isxdigit(c)))
-                return 10 + c - 'A';
-        return 0;
-}
-
-static inline int
-get_ethernet_addr(struct usbnet *dev, struct usb_cdc_ether_desc *e)
-{
-        int             tmp, i;
-        unsigned char   buf [13];
-
-        tmp = usb_string(dev->udev, e->iMACAddress, buf, sizeof buf);
-        if (tmp != 12) {
-                dev_dbg(&dev->udev->dev,
-                        "bad MAC string %d fetch, %d\n", e->iMACAddress, tmp);
-                if (tmp >= 0)
-                        tmp = -EINVAL;
-                return tmp;
-        }
-        for (i = tmp = 0; i < 6; i++, tmp += 2)
-                dev->net->dev_addr [i] =
-                        (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]);
-        return 0;
-}
-
 static int cdc_bind(struct usbnet *dev, struct usb_interface *intf)
 {
         int                             status;
@@ -428,7 +397,7 @@ static int cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         if (status < 0)
                 return status;
 
-        status = get_ethernet_addr(dev, info->ether);
+        status = usbnet_get_ethernet_addr(dev, info->ether->iMACAddress);
         if (status < 0) {
                 usb_set_intfdata(info->data, NULL);
                 usb_driver_release_interface(driver_of(intf), info->data);
diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c
new file mode 100644
index 000000000000..55cf7081de10
--- /dev/null
+++ b/drivers/net/usb/int51x1.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2009 Peter Holik
+ *
+ * Intellon usb PLC (Powerline Communications) usb net driver
+ *
+ * http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
+ *
+ * Based on the work of Jan 'RedBully' Seiffert
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or.
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/ctype.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/usb.h>
+#include <linux/usb/usbnet.h>
+
+#define INT51X1_VENDOR_ID       0x09e1
+#define INT51X1_PRODUCT_ID      0x5121
+
+#define INT51X1_HEADER_SIZE     2       /* 2 byte header */
+
+#define PACKET_TYPE_PROMISCUOUS         (1 << 0)
+#define PACKET_TYPE_ALL_MULTICAST       (1 << 1) /* no filter */
+#define PACKET_TYPE_DIRECTED            (1 << 2)
+#define PACKET_TYPE_BROADCAST           (1 << 3)
+#define PACKET_TYPE_MULTICAST           (1 << 4) /* filtered */
+
+#define SET_ETHERNET_PACKET_FILTER      0x43
+
+static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+        int len;
+
+        if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
+                deverr(dev, "unexpected tiny rx frame");
+                return 0;
+        }
+
+        len = le16_to_cpu(*(__le16 *)&skb->data[skb->len - 2]);
+
+        skb_trim(skb, len);
+
+        return 1;
+}
+
+static struct sk_buff *int51x1_tx_fixup(struct usbnet *dev,
+                struct sk_buff *skb, gfp_t flags)
+{
+        int pack_len = skb->len;
+        int pack_with_header_len = pack_len + INT51X1_HEADER_SIZE;
+        int headroom = skb_headroom(skb);
+        int tailroom = skb_tailroom(skb);
+        int need_tail = 0;
+        __le16 *len;
+
+        /* if packet and our header is smaler than 64 pad to 64 (+ ZLP) */
+        if ((pack_with_header_len) < dev->maxpacket)
+                need_tail = dev->maxpacket - pack_with_header_len + 1;
+        /*
+         * usbnet would send a ZLP if packetlength mod urbsize == 0 for us,
+         * but we need to know ourself, because this would add to the length
+         * we send down to the device...
+         */
+        else if (!(pack_with_header_len % dev->maxpacket))
+                need_tail = 1;
+
+        if (!skb_cloned(skb) &&
+                        (headroom + tailroom >= need_tail + INT51X1_HEADER_SIZE)) {
+                if (headroom < INT51X1_HEADER_SIZE || tailroom < need_tail) {
+                        skb->data = memmove(skb->head + INT51X1_HEADER_SIZE,
+                                        skb->data, skb->len);
+                        skb_set_tail_pointer(skb, skb->len);
+                }
+        } else {
+                struct sk_buff *skb2;
+
+                skb2 = skb_copy_expand(skb,
+                                INT51X1_HEADER_SIZE,
+                                need_tail,
+                                flags);
+                dev_kfree_skb_any(skb);
+                if (!skb2)
+                        return NULL;
+                skb = skb2;
+        }
+
+        pack_len += need_tail;
+        pack_len &= 0x07ff;
+
+        len = (__le16 *) __skb_push(skb, INT51X1_HEADER_SIZE);
+        *len = cpu_to_le16(pack_len);
+
+        if(need_tail)
+                memset(__skb_put(skb, need_tail), 0, need_tail);
+
+        return skb;
+}
+
+static void int51x1_async_cmd_callback(struct urb *urb)
+{
+        struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
+        int status = urb->status;
+
+        if (status < 0)
+                dev_warn(&urb->dev->dev, "async callback failed with %d\n", status);
+
+        kfree(req);
+        usb_free_urb(urb);
+}
+
+static void int51x1_set_multicast(struct net_device *netdev)
+{
+        struct usb_ctrlrequest *req;
+        int status;
+        struct urb *urb;
+        struct usbnet *dev = netdev_priv(netdev);
+        u16 filter = PACKET_TYPE_DIRECTED | PACKET_TYPE_BROADCAST;
+
+        if (netdev->flags & IFF_PROMISC) {
+                /* do not expect to see traffic of other PLCs */
+                filter |= PACKET_TYPE_PROMISCUOUS;
+                devinfo(dev, "promiscuous mode enabled");
+        } else if (netdev->mc_count ||
+                  (netdev->flags & IFF_ALLMULTI)) {
+                filter |= PACKET_TYPE_ALL_MULTICAST;
+                devdbg(dev, "receive all multicast enabled");
+        } else {
+                /* ~PROMISCUOUS, ~MULTICAST */
+                devdbg(dev, "receive own packets only");
+        }
+
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
+                devwarn(dev, "Error allocating URB");
+                return;
+        }
+
+        req = kmalloc(sizeof(*req), GFP_ATOMIC);
+        if (!req) {
+                devwarn(dev, "Error allocating control msg");
+                goto out;
+        }
+
+        req->bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        req->bRequest = SET_ETHERNET_PACKET_FILTER;
+        req->wValue = cpu_to_le16(filter);
+        req->wIndex = 0;
+        req->wLength = 0;
+
+        usb_fill_control_urb(urb, dev->udev, usb_sndctrlpipe(dev->udev, 0),
+                (void *)req, NULL, 0,
+                int51x1_async_cmd_callback,
+                (void *)req);
+
+        status = usb_submit_urb(urb, GFP_ATOMIC);
+        if (status < 0) {
+                devwarn(dev, "Error submitting control msg, sts=%d", status);
+                goto out1;
+        }
+        return;
+out1:
+        kfree(req);
+out:
+        usb_free_urb(urb);
+}
+
+static const struct net_device_ops int51x1_netdev_ops = {
+        .ndo_open               = usbnet_open,
+        .ndo_stop               = usbnet_stop,
+        .ndo_start_xmit         = usbnet_start_xmit,
+        .ndo_tx_timeout         = usbnet_tx_timeout,
+        .ndo_change_mtu         = usbnet_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_multicast_list = int51x1_set_multicast,
+};
+
+static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+        int status = usbnet_get_ethernet_addr(dev, 3);
+
+        if (status)
+                return status;
+
+        dev->net->hard_header_len += INT51X1_HEADER_SIZE;
+        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
+        dev->net->netdev_ops = &int51x1_netdev_ops;
+
+        return usbnet_get_endpoints(dev, intf);
+}
+
+static const struct driver_info int51x1_info = {
+        .description = "Intellon usb powerline adapter",
+        .bind        = int51x1_bind,
+        .rx_fixup    = int51x1_rx_fixup,
+        .tx_fixup    = int51x1_tx_fixup,
+        .in          = 1,
+        .out         = 2,
+        .flags       = FLAG_ETHER,
+};
+
+static const struct usb_device_id products[] = {
+        {
+        USB_DEVICE(INT51X1_VENDOR_ID, INT51X1_PRODUCT_ID),
+                .driver_info = (unsigned long) &int51x1_info,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(usb, products);
+
+static struct usb_driver int51x1_driver = {
+        .name       = "int51x1",
+        .id_table   = products,
+        .probe      = usbnet_probe,
+        .disconnect = usbnet_disconnect,
+        .suspend    = usbnet_suspend,
+        .resume     = usbnet_resume,
+};
+
+static int __init int51x1_init(void)
+{
+        return usb_register(&int51x1_driver);
+}
+module_init(int51x1_init);
+
+static void __exit int51x1_exit(void)
+{
+        usb_deregister(&int51x1_driver);
+}
+module_exit(int51x1_exit);
+
+MODULE_AUTHOR("Peter Holik");
+MODULE_DESCRIPTION("Intellon usb powerline adapter");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 3d0d0b0b37c5..e01314789718 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -31,7 +31,6 @@
  ****************************************************************/
 
 /* TODO:
- * Fix in_interrupt() problem
  * Develop test procedures for USB net interfaces
  * Run test procedures
  * Fix bugs from previous two steps
@@ -606,14 +605,30 @@ static void kaweth_usb_receive(struct urb *urb)
 
         struct sk_buff *skb;
 
-        if(unlikely(status == -ECONNRESET || status == -ESHUTDOWN))
-        /* we are killed - set a flag and wake the disconnect handler */
-        {
+        if (unlikely(status == -EPIPE)) {
+                kaweth->stats.rx_errors++;
                 kaweth->end = 1;
                 wake_up(&kaweth->term_wait);
+                dbg("Status was -EPIPE.");
                 return;
         }
-
+        if (unlikely(status == -ECONNRESET || status == -ESHUTDOWN)) {
+                /* we are killed - set a flag and wake the disconnect handler */
+                kaweth->end = 1;
+                wake_up(&kaweth->term_wait);
+                dbg("Status was -ECONNRESET or -ESHUTDOWN.");
+                return;
+        }
+        if (unlikely(status == -EPROTO || status == -ETIME ||
+                     status == -EILSEQ)) {
+                kaweth->stats.rx_errors++;
+                dbg("Status was -EPROTO, -ETIME, or -EILSEQ.");
+                return;
+        }
+        if (unlikely(status == -EOVERFLOW)) {
+                kaweth->stats.rx_errors++;
+                dbg("Status was -EOVERFLOW.");
+        }
         spin_lock(&kaweth->device_lock);
         if (IS_BLOCKED(kaweth->status)) {
                 spin_unlock(&kaweth->device_lock);
@@ -883,13 +898,16 @@ static void kaweth_set_rx_mode(struct net_device *net)
  ****************************************************************/
 static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
 {
+        int result;
         __u16 packet_filter_bitmap = kaweth->packet_filter_bitmap;
+
         kaweth->packet_filter_bitmap = 0;
         if (packet_filter_bitmap == 0)
                 return;
 
-        {
-        int result;
+        if (in_interrupt())
+                return;
+
         result = kaweth_control(kaweth,
                                 usb_sndctrlpipe(kaweth->dev, 0),
                                 KAWETH_COMMAND_SET_PACKET_FILTER,
@@ -906,7 +924,6 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
         else {
                 dbg("Set Rx mode to %d", packet_filter_bitmap);
         }
-        }
 }
 
 /****************************************************************
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f3a2fce6166c..c94de6243140 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/ctype.h>
 #include <linux/ethtool.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
@@ -156,6 +157,36 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
 }
 EXPORT_SYMBOL_GPL(usbnet_get_endpoints);
 
+static u8 nibble(unsigned char c)
+{
+        if (likely(isdigit(c)))
+                return c - '0';
+        c = toupper(c);
+        if (likely(isxdigit(c)))
+                return 10 + c - 'A';
+        return 0;
+}
+
+int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
+{
+        int             tmp, i;
+        unsigned char   buf [13];
+
+        tmp = usb_string(dev->udev, iMACAddress, buf, sizeof buf);
+        if (tmp != 12) {
+                dev_dbg(&dev->udev->dev,
+                        "bad MAC string %d fetch, %d\n", iMACAddress, tmp);
+                if (tmp >= 0)
+                        tmp = -EINVAL;
+                return tmp;
+        }
+        for (i = tmp = 0; i < 6; i++, tmp += 2)
+                dev->net->dev_addr [i] =
+                        (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
+
 static void intr_complete (struct urb *urb);
 
 static int init_status (struct usbnet *dev, struct usb_interface *intf)
@@ -1185,12 +1216,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 #endif
 
         net->netdev_ops = &usbnet_netdev_ops;
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-        net->hard_start_xmit = usbnet_start_xmit;
-        net->open = usbnet_open;
-        net->stop = usbnet_stop;
-        net->tx_timeout = usbnet_tx_timeout;
-#endif
         net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
         net->ethtool_ops = &usbnet_ethtool_ops;