r134 - tarballs unstable/rt73/debian unstable/rt73/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Mon Jun 23 03:27:53 UTC 2008
Author: benh
Date: 2008-06-23 03:27:51 +0000 (Mon, 23 Jun 2008)
New Revision: 134
Added:
tarballs/rt73_1.0.3.6-cvs20080623-dfsg1.orig.tar.gz
unstable/rt73/debian/patches/000_if_name.diff
Modified:
unstable/rt73/debian/changelog
unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff
unstable/rt73/debian/patches/002_fix_probe_crash.diff
Log:
Added new CVS snapshot.
Added patch to remove bogus code for generating a unique interface name, as in the other legacy driver.
Refreshed other patches.
Added: tarballs/rt73_1.0.3.6-cvs20080623-dfsg1.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/rt73_1.0.3.6-cvs20080623-dfsg1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/rt73/debian/changelog
===================================================================
--- unstable/rt73/debian/changelog 2008-06-23 02:12:49 UTC (rev 133)
+++ unstable/rt73/debian/changelog 2008-06-23 03:27:51 UTC (rev 134)
@@ -1,10 +1,13 @@
-rt73 (1:1.0.3.6-cvs20071123-dfsg1-4) unstable; urgency=low
+rt73 (1:1.0.3.6-cvs20080623-dfsg1-1) unstable; urgency=low
- [ Ben Hutchings ]
+ * New CVS snapshot
+ - Fixes initialisation order on newer kernels. Closes: #468422.
* Recommends: firmware-ralink, replacing firmware-rt73.
Closes: #454920.
+ * Patch 000_if_name.diff removes bogus code for generating a unique
+ interface name.
- --
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 23 Jun 2008 02:39:09 +0100
rt73 (1:1.0.3.6-cvs20071123-dfsg1-3) unstable; urgency=low
Added: unstable/rt73/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt73/debian/patches/000_if_name.diff (rev 0)
+++ unstable/rt73/debian/patches/000_if_name.diff 2008-06-23 03:27:51 UTC (rev 134)
@@ -0,0 +1,54 @@
+--- rt73.orig/Module/rtmp_main.c
++++ rt73/Module/rtmp_main.c
+@@ -2225,10 +2225,7 @@
+
+ SET_NETDEV_DEV(netdev, &intf->dev);
+
+- {// find available
+- int i=0;
+- char slot_name[IFNAMSIZ];
+- //struct net_device *device;
++ {
+ struct usb_host_interface *iface_desc;
+ struct usb_endpoint_descriptor *endpoint;
+
+@@ -2237,39 +2234,6 @@
+ else
+ strncpy(pAd->net_dev->name, ifname, IFNAMSIZ);
+
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, pAd->net_dev->name, i);
+-
+-#if 1
+- if(dev_get_by_name(slot_name)==NULL)
+- break;
+-#else
+- read_lock_bh(&dev_base_lock); // avoid multiple init
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- read_unlock_bh(&dev_base_lock);
+-
+- if(device == NULL) break;
+-#endif
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- KPRINT(KERN_CRIT, "No available slot name\n");
+- goto out;
+- }
+-
+- sprintf(pAd->net_dev->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_ERROR, "usb device name %s\n", pAd->net_dev->name);
+-
+-
+ /* get the active interface descriptor */
+ iface_desc = intf->cur_altsetting;
+
Modified: unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff
===================================================================
--- unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff 2008-06-23 02:12:49 UTC (rev 133)
+++ unstable/rt73/debian/patches/001_fix_probe_148f_2573.diff 2008-06-23 03:27:51 UTC (rev 134)
@@ -1,6 +1,6 @@
--- rt73.orig/Module/rtmp_main.c
+++ rt73/Module/rtmp_main.c
-@@ -2114,6 +2114,7 @@
+@@ -2154,6 +2154,7 @@
{
struct usb_device *dev = interface_to_usbdev(intf);
PRTMP_ADAPTER pAd;
@@ -8,7 +8,7 @@
int i;
struct net_device *netdev;
int res = -ENOMEM;
-@@ -2151,10 +2152,19 @@
+@@ -2193,10 +2194,19 @@
}
netdev->priv = pAd;
@@ -17,7 +17,7 @@
+ RTUSBReadMACRegister(pAd, MAC_CSR0, &version);
+ if ((version & 0xf) == 0 || (le32_to_cpu(version) & 0xffff0) != 0x25730)
+ {
-+ printk("ASIC version not matching\n");
++ KPRINT(KERN_INFO, "ASIC version not matching\n");
+ res = -ENODEV;
+ goto out;
+ }
Modified: unstable/rt73/debian/patches/002_fix_probe_crash.diff
===================================================================
--- unstable/rt73/debian/patches/002_fix_probe_crash.diff 2008-06-23 02:12:49 UTC (rev 133)
+++ unstable/rt73/debian/patches/002_fix_probe_crash.diff 2008-06-23 03:27:51 UTC (rev 134)
@@ -1,30 +1,30 @@
--- rt73.orig/Module/rtmp_main.c
+++ rt73/Module/rtmp_main.c
-@@ -2159,7 +2159,7 @@
+@@ -2201,7 +2201,7 @@
{
- printk("ASIC version not matching\n");
+ KPRINT(KERN_INFO, "ASIC version not matching\n");
res = -ENODEV;
- goto out;
+ goto out_noregnetdev;
}
pAd->net_dev = netdev;
-@@ -2258,7 +2258,7 @@
+@@ -2259,19 +2259,22 @@
res = register_netdev(netdev);
if (res) {
- printk("register_netdev failed err=%d\n",res);
+ KPRINT(KERN_CRIT, "register_netdev failed err=%d\n",res);
- goto out;
+ goto out_noregnetdev;
}
usb_set_intfdata(intf, pAd);
-@@ -2268,16 +2268,19 @@
- res = LoadFirmware(pAd, firmName);
- if (res) {
- DBGPRINT(RT_DEBUG_ERROR, "Failed to request Firmware.\n");
-- goto out;
-+ goto out_nofirmware;
- }
+
+ rt73usb_open_debugfs(pAd);
+ res = common_probe(pAd);
+- if (res) goto out;
++ if (res) goto out_nofirmware;
+
+ DBGPRINT(RT_DEBUG_TRACE, "<-- %s: res=%d\n", __FUNCTION__, res);
return 0;
-out:
@@ -35,9 +35,3 @@
free_netdev(netdev);
out_nonetdev:
kfree(pAd);
- out_noalloc:
-- module_put(THIS_MODULE);
-+ usb_put_dev(dev);
- return res;
- }
-
More information about the Pkg-ralink-commits
mailing list