4 files changed, 13 insertions, 10 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index a12c9c41b217..0604f3faf043 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -129,7 +129,7 @@ config USB_USBNET
 
 config USB_NET_AX8817X
         tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
-        depends on USB_USBNET && NET_ETHERNET
+        depends on USB_USBNET
         select CRC32
         default y
         help
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 4b131a6c6b70..01660f68943a 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -341,7 +341,7 @@ static void dm9601_set_multicast(struct net_device *net)
         /* We use the 20 byte dev->data for our 8 byte filter buffer
          * to avoid allocating memory that is tricky to free later */
         u8 *hashes = (u8 *) & dev->data;
-        u8 rx_ctl = 0x01;
+        u8 rx_ctl = 0x31;
 
         memset(hashes, 0x00, DM_MCAST_SIZE);
         hashes[DM_MCAST_SIZE - 1] |= 0x80;      /* broadcast address */
@@ -354,7 +354,7 @@ static void dm9601_set_multicast(struct net_device *net)
                 struct dev_mc_list *mc_list = net->mc_list;
                 int i;
 
-                for (i = 0; i < net->mc_count; i++) {
+                for (i = 0; i < net->mc_count; i++, mc_list = mc_list->next) {
                         u32 crc = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
                         hashes[crc >> 3] |= 1 << (crc & 0x7);
                 }
@@ -562,6 +562,10 @@ static const struct usb_device_id products[] = {
          USB_DEVICE(0x0a46, 0x8515),    /* ADMtek ADM8515 USB NIC */
          .driver_info = (unsigned long)&dm9601_info,
          },
+        {
+        USB_DEVICE(0x0a47, 0x9601),     /* Hirose USB-100 */
+        .driver_info = (unsigned long)&dm9601_info,
+         },
         {},                     // END
 };
 
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index d1ed68a11e70..b588c890ea70 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1128,12 +1128,8 @@ pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         pegasus_t *pegasus;
 
-        if (in_atomic())
-                return 0;
-
         pegasus = netdev_priv(dev);
         mii_ethtool_gset(&pegasus->mii, ecmd);
-
         return 0;
 }
 
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 727547a28992..369c731114b3 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -283,7 +283,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                 struct rndis_set_c      *set_c;
                 struct rndis_halt       *halt;
         } u;
-        u32                     tmp, *phym;
+        u32                     tmp, phym_unspec, *phym;
         int                     reply_len;
         unsigned char           *bp;
 
@@ -363,12 +363,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                 goto halt_fail_and_release;
 
         /* Check physical medium */
+        phym = NULL;
         reply_len = sizeof *phym;
         retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
                         0, (void **) &phym, &reply_len);
-        if (retval != 0)
+        if (retval != 0 || !phym) {
                 /* OID is optional so don't fail here. */
-                *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym_unspec = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym = &phym_unspec;
+        }
         if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
                         *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
                 if (netif_msg_probe(dev))