Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/s2io.c

3 files changed, 2 insertions, 6 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 2968bb342ea3..f7319d326912 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -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);
                 }
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;
 }