Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index e391ef969c28..c4c334d9770f 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -145,6 +145,7 @@ static struct usb_device_id usb_klsi_table[] = {
         { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */
         { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */
         { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */
+        { USB_DEVICE(0x07c9, 0xb010) }, /* Allied Telesyn AT-USB10 USB Ethernet Adapter */
         { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */
         { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */
         { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */
@@ -471,16 +472,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
         int result;
 
         dbg("kaweth_reset(%p)", kaweth);
-        result = kaweth_control(kaweth,
-                                usb_sndctrlpipe(kaweth->dev, 0),
-                                USB_REQ_SET_CONFIGURATION,
-                                0,
-                                kaweth->dev->config[0].desc.bConfigurationValue,
-                                0,
-                                NULL,
-                                0,
-                                KAWETH_CONTROL_TIMEOUT);
-
+        result = usb_reset_configuration(kaweth->dev);
         mdelay(10);
 
         dbg("kaweth_reset() returns %d.",result);
@@ -725,7 +717,7 @@ static int kaweth_open(struct net_device *net)
         return 0;
 
 err_out:
-        usb_autopm_enable(kaweth->intf);
+        usb_autopm_put_interface(kaweth->intf);
         return -EIO;
 }
 
@@ -762,7 +754,7 @@ static int kaweth_close(struct net_device *net)
 
         kaweth->status &= ~KAWETH_STATUS_CLOSING;
 
-        usb_autopm_enable(kaweth->intf);
+        usb_autopm_put_interface(kaweth->intf);
 
         return 0;
 }
@@ -890,7 +882,7 @@ static void kaweth_set_rx_mode(struct net_device *net)
         if (net->flags & IFF_PROMISC) {
                 packet_filter_bitmap |= KAWETH_PACKET_FILTER_PROMISCUOUS;
         }
-        else if ((net->mc_count) || (net->flags & IFF_ALLMULTI)) {
+        else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
                 packet_filter_bitmap |= KAWETH_PACKET_FILTER_ALL_MULTICAST;
         }