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

Conflicts:
	drivers/net/wireless/orinoco/main.c

3 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index cd35d50e46d4..45cebfb302cf 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -311,7 +311,7 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                          *      bmCRC = 0       : CRC = 0xDEADBEEF
                          */
                         if (header & BIT(14))
-                                crc2 = ~crc32_le(~0, skb2->data, len);
+                                crc2 = ~crc32_le(~0, skb2->data, skb2->len);
                         else
                                 crc2 = 0xdeadbeef;
 
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 09a5bd381566..200fe3d525ca 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -999,6 +999,9 @@ static const struct net_device_ops kaweth_netdev_ops = {
         .ndo_tx_timeout =               kaweth_tx_timeout,
         .ndo_set_multicast_list =       kaweth_set_rx_mode,
         .ndo_get_stats =                kaweth_netdev_stats,
+        .ndo_change_mtu =               eth_change_mtu,
+        .ndo_set_mac_address =          eth_mac_addr,
+        .ndo_validate_addr =            eth_validate_addr,
 };
 
 static int kaweth_probe(
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 632d1aeda570..69d2df95ac86 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1493,6 +1493,9 @@ static const struct net_device_ops pegasus_netdev_ops = {
         .ndo_set_multicast_list =       pegasus_set_multicast,
         .ndo_get_stats =                pegasus_netdev_stats,
         .ndo_tx_timeout =               pegasus_tx_timeout,
+        .ndo_change_mtu =               eth_change_mtu,
+        .ndo_set_mac_address =          eth_mac_addr,
+        .ndo_validate_addr =            eth_validate_addr,
 };
 
 static struct usb_driver pegasus_driver = {