r57 - unstable/rt2500/debian/patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-14 18:56:04 +0000 (Sun, 14 Oct 2007)
New Revision: 57

Modified:
   unstable/rt2500/debian/patches/000_if_name.diff
Log:
Updated for new upstream version.


Modified: unstable/rt2500/debian/patches/000_if_name.diff
===================================================================
--- unstable/rt2500/debian/patches/000_if_name.diff	2007-10-14 18:55:26 UTC (rev 56)
+++ unstable/rt2500/debian/patches/000_if_name.diff	2007-10-14 18:56:04 UTC (rev 57)
@@ -1,26 +1,15 @@
---- Utilitys/raconfig.cpp
-+++ Utilitys/raconfig.cpp
-@@ -38,7 +38,7 @@
- // This function reads the user's preference from the configuration file.
- 
- #define CONFFILE "/etc/rt2x00.conf"
--#define DEFAULT_DEVICE_NAME "ra%%d"
-+#define DEFAULT_DEVICE_NAME "eth%%d"
- int read_conf (char *devname)
- {
-   FILE *filep;
---- Module/rtmp_main.c
+--- Module/rtmp_main.c.orig
 +++ Module/rtmp_main.c
-@@ -60,7 +60,7 @@
+@@ -58,7 +58,7 @@
  
  static char *ifname = NULL ;
  MODULE_PARM(ifname, "s");
 -MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
 +MODULE_PARM_DESC(ifname, "Network device name (default eth%d)");
  #else
- int debug = 0;	/* Default is off. */
+ static int debug = 0;	/* Default is off. */
  module_param(debug, int, 0);
-@@ -68,7 +68,7 @@
+@@ -66,7 +66,7 @@
  
  static char *ifname = NULL ;
  module_param(ifname, charp, 0);
@@ -29,3 +18,14 @@
  #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
  
  // Following information will be show when you run 'modinfo'
+@@ -315,9 +315,8 @@
+ 
+ 
+     // 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(net_dev->name, "ra%d");
++       strcpy(net_dev->name, "eth%d");
+     else
+        strncpy(net_dev->name, ifname, IFNAMSIZ);
+