r186 - in unstable/rt2570/debian: . patches

[Ben Hutchings]

Author: benh
Date: 2009-05-02 21:01:12 +0000 (Sat, 02 May 2009)
New Revision: 186

Added:
   unstable/rt2570/debian/patches/011_fix_max_usb_packet_size.diff
Modified:
   unstable/rt2570/debian/changelog
   unstable/rt2570/debian/patches/series
Log:
Fix lookup of max USB packet size (same as bug#516519 in rt73)


Modified: unstable/rt2570/debian/changelog
===================================================================
--- unstable/rt2570/debian/changelog	2009-05-02 21:00:31 UTC (rev 185)
+++ unstable/rt2570/debian/changelog	2009-05-02 21:01:12 UTC (rev 186)
@@ -3,6 +3,7 @@
   * New CVS snapshot; the last version from rt2x00.serialmonkey.com
     - Obsoletes 007_fix_probe_request_overflow.diff, 009_use_kill_pid.diff,
       010_iwe_stream_update.diff
+  * Fix lookup of max USB packet size (same as bug#516519 in rt73)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 May 2009 21:17:20 +0100
 

Added: unstable/rt2570/debian/patches/011_fix_max_usb_packet_size.diff
===================================================================
--- unstable/rt2570/debian/patches/011_fix_max_usb_packet_size.diff	                        (rev 0)
+++ unstable/rt2570/debian/patches/011_fix_max_usb_packet_size.diff	2009-05-02 21:01:12 UTC (rev 186)
@@ -0,0 +1,28 @@
+Fix lookup of max USB packet size (closes: bug#516519)
+
+--- rt2570-1.1.0+cvs20090424.orig/Module/rtusb_main.c
++++ rt2570-1.1.0+cvs20090424/Module/rtusb_main.c
+@@ -1826,21 +1826,8 @@
+ 		endpoint = &iface_desc->endpoint[i].desc;
+ 
+ 		/* get Max Packet Size from endpoint */
+-		pAdapter->BulkOutMaxPacketSize = le16_to_cpu(endpoint->wMaxPacketSize);
+-		
+-		// Workaround suggested by Ivo in forum
+-		if (pAdapter->BulkOutMaxPacketSize == 0) {
+-			pAdapter->BulkOutMaxPacketSize = 1;
+-			DBGPRINT(RT_DEBUG_WARN,
+-					"-  %s: Device reports zero length wMaxPacketSize. "
+-					"Using workaround.\n",
+-					__FUNCTION__);
+-			KPRINT(KERN_WARNING, "Device reports zero length wMaxPacketSize. "
+-					"Using workaround.\n");
+-		}
+-
+-		DBGPRINT(RT_DEBUG_INFO, "BulkOutMaxPacketSize %d\n",
+-			 pAdapter->BulkOutMaxPacketSize);
++		pAdapter->BulkOutMaxPacketSize =
++			usb_maxpacket(dev, usb_sndbulkpipe(dev, 1), true);
+ 	}
+ 
+ 	res = register_netdev(pAdapter->net);

Modified: unstable/rt2570/debian/patches/series
===================================================================
--- unstable/rt2570/debian/patches/series	2009-05-02 21:00:31 UTC (rev 185)
+++ unstable/rt2570/debian/patches/series	2009-05-02 21:01:12 UTC (rev 186)
@@ -2,3 +2,4 @@
 005_fix_delays.diff
 006_fix_probe_148f_2573.diff
 008_use_netdev_functions.diff
+011_fix_max_usb_packet_size.diff