X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fnet%2Fzaurus.c;fp=drivers%2Fusb%2Fnet%2Fzaurus.c;h=9c5ab251370c5b78e578b24e0d1aaafbe0d61744;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=144566bda583aa26b029de28ee8eeb7d27a65727;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c
index 144566bda..9c5ab2513 100644
--- a/drivers/usb/net/zaurus.c
+++ b/drivers/usb/net/zaurus.c
@@ -20,6 +20,7 @@
 // #define	DEBUG			// error path messages, extra info
 // #define	VERBOSE			// more; success messages
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
@@ -29,7 +30,7 @@
 #include <linux/mii.h>
 #include <linux/crc32.h>
 #include <linux/usb.h>
-#include <linux/usb/cdc.h>
+#include <linux/usb_cdc.h>
 
 #include "usbnet.h"
 
@@ -108,7 +109,7 @@ static const struct driver_info	zaurus_sl5x00_info = {
 	.check_connect = always_connected,
 	.bind =		zaurus_bind,
 	.unbind =	usbnet_cdc_unbind,
-	.tx_fixup =	zaurus_tx_fixup,
+	.tx_fixup = 	zaurus_tx_fixup,
 };
 #define	ZAURUS_STRONGARM_INFO	((unsigned long)&zaurus_sl5x00_info)
 
@@ -118,7 +119,7 @@ static const struct driver_info	zaurus_pxa_info = {
 	.check_connect = always_connected,
 	.bind =		zaurus_bind,
 	.unbind =	usbnet_cdc_unbind,
-	.tx_fixup =	zaurus_tx_fixup,
+	.tx_fixup = 	zaurus_tx_fixup,
 };
 #define	ZAURUS_PXA_INFO		((unsigned long)&zaurus_pxa_info)
 
@@ -128,7 +129,7 @@ static const struct driver_info	olympus_mxl_info = {
 	.check_connect = always_connected,
 	.bind =		zaurus_bind,
 	.unbind =	usbnet_cdc_unbind,
-	.tx_fixup =	zaurus_tx_fixup,
+	.tx_fixup = 	zaurus_tx_fixup,
 };
 #define	OLYMPUS_MXL_INFO	((unsigned long)&olympus_mxl_info)
 
@@ -216,7 +217,7 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
 			 * with devices that use it and those that don't.
 			 */
 			if ((detail->bDetailData[1] & ~0x02) != 0x01) {
-				/* bmDataCapabilities == 0 would be fine too,
+				/* bmDataCapabilites == 0 would be fine too,
 				 * but framing is minidriver-coupled for now.
 				 */
 bad_detail:
@@ -227,11 +228,6 @@ bad_detail:
 						detail->bDetailData[2]);
 				goto bad_desc;
 			}
-
-			/* same extra framing as for non-BLAN mode */
-			dev->net->hard_header_len += 6;
-			dev->rx_urb_size = dev->net->hard_header_len
-					+ dev->net->mtu;
 			break;
 		}
 next_desc:
@@ -262,7 +258,7 @@ static const struct driver_info	bogus_mdlm_info = {
 	.description =	"pseudo-MDLM (BLAN) device",
 	.flags =	FLAG_FRAMING_Z,
 	.check_connect = always_connected,
-	.tx_fixup =	zaurus_tx_fixup,
+	.tx_fixup = 	zaurus_tx_fixup,
 	.bind =		blan_mdlm_bind,
 };
 
@@ -371,13 +367,13 @@ static struct usb_driver zaurus_driver = {
 
 static int __init zaurus_init(void)
 {
-	return usb_register(&zaurus_driver);
+ 	return usb_register(&zaurus_driver);
 }
 module_init(zaurus_init);
 
 static void __exit zaurus_exit(void)
 {
-	usb_deregister(&zaurus_driver);
+ 	usb_deregister(&zaurus_driver);
 }
 module_exit(zaurus_exit);