r23 - tarballs unstable/rt2570/debian unstable/rt2570/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Sat Sep 29 20:37:22 UTC 2007
Author: benh
Date: 2007-09-29 20:37:22 +0000 (Sat, 29 Sep 2007)
New Revision: 23
Added:
tarballs/rt2570_1.1.0+cvs20070927.orig.tar.gz
Modified:
unstable/rt2570/debian/changelog
unstable/rt2570/debian/patches/000_if_name.diff
Log:
Made new CVS snapshot dated 2007-09-27.
Added: tarballs/rt2570_1.1.0+cvs20070927.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/rt2570_1.1.0+cvs20070927.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/rt2570/debian/changelog
===================================================================
--- unstable/rt2570/debian/changelog 2007-09-29 20:36:02 UTC (rev 22)
+++ unstable/rt2570/debian/changelog 2007-09-29 20:37:22 UTC (rev 23)
@@ -1,3 +1,11 @@
+rt2570 (1.1.0+cvs20070927-1) unstable; urgency=low
+
+ * New CVS snapshot
+ - Believed to be SMP-safe (closes: bug#423127)
+ - Supports Linux 2.6.22 (closes: bug#432533)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 29 Sep 2007 21:13:30 +0100
+
rt2570 (1.1.0+cvs20070219-2) unstable; urgency=low
* Switch maintainer to "Debian Ralink packages maintainers".
@@ -57,7 +65,3 @@
* Initial Release (closes: bug#339599).
-- Aurelien Jarno <aurel32 at debian.org> Sun, 29 May 2005 19:03:04 +0200
-
-Local variables:
-mode: debian-changelog
-End:
Modified: unstable/rt2570/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2570/debian/patches/000_if_name.diff 2007-09-29 20:36:02 UTC (rev 22)
+++ unstable/rt2570/debian/patches/000_if_name.diff 2007-09-29 20:37:22 UTC (rev 23)
@@ -1,38 +1,112 @@
---- Module/rtusb_main.c
+--- Module/rtusb_main.c.orig
+++ Module/rtusb_main.c
-@@ -1583,7 +1583,7 @@
+@@ -42,7 +42,7 @@
- for (i = 0; i < 8; i++)
- {
-- sprintf(slot_name, "rausb%d", i);
-+ sprintf(slot_name, "eth%d", i);
-
- for (device = dev_base; device != NULL; device = device->next)
- {
-@@ -1600,7 +1600,7 @@
- return NULL;
- }
+ static char *ifname = NULL ;
+ MODULE_PARM(ifname, "s");
+-MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #else
+ static int debug = 0; /* Default is off. */
+ module_param(debug, int, 0);
+@@ -50,7 +50,7 @@
-- sprintf(pAdapter->net->name, "rausb%d", i);
-+ sprintf(pAdapter->net->name, "eth%d", i);
- DBGPRINT(RT_DEBUG_ERROR, "usbdevice->name %s\n",pAdapter->net->name);
- }
+ static char *ifname = NULL ;
+ module_param(ifname, charp, 0);
+-MODULE_PARM_DESC(ifname, "Network device name (default rausb%d)");
++MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
-@@ -1902,7 +1902,7 @@
+ #ifdef RT2500_DBG
+@@ -1608,43 +1608,17 @@
+ pAdapter->net->weight = 64;
+ pAdapter->MediaState = NdisMediaStateDisconnected;
- for (i = 0; i < 8; i++)
- {
-- sprintf(slot_name, "rausb%d", i);
-+ sprintf(slot_name, "eth%d", i);
-
- for (device = dev_base; device != NULL; device = device->next)
- {
-@@ -1919,7 +1919,7 @@
- return res;
- }
+- {// find available
+- int i=0;
+- char slot_name[IFNAMSIZ];
+- struct net_device *device;
++ {
+ struct usb_interface *ifp = &dev->actconfig->interface[interface]; // get interface from system
+ struct usb_interface_descriptor *as;
+ struct usb_endpoint_descriptor *ep;
-- sprintf(pAdapter->net->name, "rausb%d", i);
-+ sprintf(pAdapter->net->name, "eth%d", i);
- }
+ // register_netdev() will call dev_alloc_name() for us
+- // TODO: Remove the following line to keep the default eth%d name
+ if (ifname == NULL)
+- strcpy(netdev->name, "rausb%d");
++ strcpy(netdev->name, "eth%d");
+ else
+ strncpy(netdev->name, ifname, IFNAMSIZ);
- pAdapter->rx_bh.func = RTUSBRxPacket;
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, netdev->name, i);
+-
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- if(device == NULL) break;
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- return NULL;
+- }
+- sprintf(netdev->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_INFO, "usbdevice->name %s\n", netdev->name);
+-
+ /* get Max Packet Size from usb_dev endpoint */
+ //ifp = dev->actconfig->interface + i;
+ as = ifp->altsetting + ifp->act_altsetting;
+@@ -1950,43 +1924,16 @@
+
+ SET_NETDEV_DEV(pAdapter->net, &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;
+
+ // register_netdev() will call dev_alloc_name() for us
+- // TODO: Remove the following line to keep the default eth%d name
+ if (ifname == NULL)
+- strcpy(pAdapter->net->name, "rausb%d");
++ strcpy(pAdapter->net->name, "eth%d");
+ else
+ strncpy(pAdapter->net->name, ifname, IFNAMSIZ);
+
+- for (i = 0; i < 8; i++)
+- {
+- sprintf(slot_name, pAdapter->net->name, i);
+-
+- for (device = first_net_device(); device != NULL;
+- device = next_net_device(device))
+- {
+- if (strncmp(device->name, slot_name, IFNAMSIZ) == 0)
+- {
+- break;
+- }
+- }
+- if(device == NULL) break;
+- }
+- if(i == 8)
+- {
+- DBGPRINT(RT_DEBUG_ERROR, "No available slot name\n");
+- return res;
+- }
+-
+- sprintf(pAdapter->net->name, slot_name, i);
+- DBGPRINT(RT_DEBUG_INFO, "usbdevice->name %s\n", pAdapter->net->name);
+-
+ /* get the active interface descriptor */
+ iface_desc = intf->cur_altsetting;
+
More information about the Pkg-ralink-commits
mailing list