Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (94 commits)
  genetlink: fix netns vs. netlink table locking (2)
  3c59x: Get rid of "Trying to free already-free IRQ"
  tunnel: eliminate recursion field
  ems_pci: fix size of CAN controllers BAR mapping for CPC-PCI v2
  net: fix htmldocs sunrpc, clnt.c
  Phonet: error on broadcast sending (unimplemented)
  Phonet: fix race for port number in concurrent bind()
  pktgen: better scheduler friendliness
  pktgen: T_TERMINATE flag is unused
  ipv4: check optlen for IP_MULTICAST_IF option
  ath9k: Initialize txgain and rxgain for newer AR9287 chipsets.
  iwlagn: fix panic in iwl{5000,4965}_rx_reply_tx
  ath9k: Fix RFKILL bugs
  drivers/net/wireless: Use usb_endpoint_dir_out
  cfg80211: don't overwrite privacy setting
  wl12xx: fix kconfig/link errors
  rt2x00: fix the definition of rt2x00crypto_rx_insert_iv
  iwlwifi: reduce noise when skb allocation fails
  iwlwifi: do not send sync command while holding spinlock
  mac80211: fix DTIM setting
  ...

1 files changed, 66 insertions, 1 deletions

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 938fb3530a7a..c6c922247d05 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1227,7 +1227,7 @@ static const struct driver_info smsc95xx_info = {
         .rx_fixup       = smsc95xx_rx_fixup,
         .tx_fixup       = smsc95xx_tx_fixup,
         .status         = smsc95xx_status,
-        .flags          = FLAG_ETHER,
+        .flags          = FLAG_ETHER | FLAG_SEND_ZLP,
 };
 
 static const struct usb_device_id products[] = {
@@ -1237,10 +1237,75 @@ static const struct usb_device_id products[] = {
                 .driver_info = (unsigned long) &smsc95xx_info,
         },
         {
+                /* SMSC9505 USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9505),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9500A USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9E00),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9505A USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9E01),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
                 /* SMSC9512/9514 USB Hub & Ethernet Device */
                 USB_DEVICE(0x0424, 0xec00),
                 .driver_info = (unsigned long) &smsc95xx_info,
         },
+        {
+                /* SMSC9500 USB Ethernet Device (SAL10) */
+                USB_DEVICE(0x0424, 0x9900),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9505 USB Ethernet Device (SAL10) */
+                USB_DEVICE(0x0424, 0x9901),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9500A USB Ethernet Device (SAL10) */
+                USB_DEVICE(0x0424, 0x9902),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9505A USB Ethernet Device (SAL10) */
+                USB_DEVICE(0x0424, 0x9903),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9512/9514 USB Hub & Ethernet Device (SAL10) */
+                USB_DEVICE(0x0424, 0x9904),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9500A USB Ethernet Device (HAL) */
+                USB_DEVICE(0x0424, 0x9905),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9505A USB Ethernet Device (HAL) */
+                USB_DEVICE(0x0424, 0x9906),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9500 USB Ethernet Device (Alternate ID) */
+                USB_DEVICE(0x0424, 0x9907),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9500A USB Ethernet Device (Alternate ID) */
+                USB_DEVICE(0x0424, 0x9908),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC9512/9514 USB Hub & Ethernet Device (Alternate ID) */
+                USB_DEVICE(0x0424, 0x9909),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
         { },            /* END */
 };
 MODULE_DEVICE_TABLE(usb, products);