From ccfa4a7af6c49dd72a541f25568e1ab561002aa7 Mon Sep 17 00:00:00 2001 From: Tim Yardley Date: Mon, 5 Mar 2007 01:38:44 +0000 Subject: trunk.. same deal as changeset:6526 SVN-Revision: 6527 --- .../patches/001-wireless_extensions_version.patch | 12 ++++++++++++ .../rt61/patches/002-linux_2_4_module_param.patch | 22 ++++++++++++++++++++++ .../patches/01-wireless_extensions_version.patch | 12 ------------ .../rt61/patches/02-linux_2_4_module_param.patch | 22 ---------------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 package/rt61/patches/001-wireless_extensions_version.patch create mode 100644 package/rt61/patches/002-linux_2_4_module_param.patch delete mode 100644 package/rt61/patches/01-wireless_extensions_version.patch delete mode 100644 package/rt61/patches/02-linux_2_4_module_param.patch (limited to 'package/rt61') diff --git a/package/rt61/patches/001-wireless_extensions_version.patch b/package/rt61/patches/001-wireless_extensions_version.patch new file mode 100644 index 0000000000..b0e254a908 --- /dev/null +++ b/package/rt61/patches/001-wireless_extensions_version.patch @@ -0,0 +1,12 @@ +diff -urN rt61-1.1.0-b1/Module/rtmp_main.c rt61-1.1.0-b1.new/Module/rtmp_main.c +--- rt61-1.1.0-b1/Module/rtmp_main.c 2006-06-18 10:58:40.000000000 +0200 ++++ rt61-1.1.0-b1.new/Module/rtmp_main.c 2006-12-17 19:59:10.000000000 +0100 +@@ -252,7 +252,7 @@ + net_dev->stop = RT61_close; + net_dev->get_stats = RT61_get_ether_stats; + +-#if WIRELESS_EXT >= 12 ++#if WIRELESS_EXT >= 12 && WIRELESS_EXT < 21 + net_dev->get_wireless_stats = RT61_get_wireless_stats; + net_dev->wireless_handlers = (struct iw_handler_def *) &rt61_iw_handler_def; + #endif diff --git a/package/rt61/patches/002-linux_2_4_module_param.patch b/package/rt61/patches/002-linux_2_4_module_param.patch new file mode 100644 index 0000000000..ee773a856a --- /dev/null +++ b/package/rt61/patches/002-linux_2_4_module_param.patch @@ -0,0 +1,22 @@ +--- rt61-old/Module/rtmp_main.c 2006/06/16 11:12:40 1.14 ++++ rt61-new/Module/rtmp_main.c 2006/08/12 13:03:25 1.15 +@@ -48,11 +48,19 @@ + // Global variable, debug level flag + // Don't hide this behing debug define. There should be as little difference between debug and no-debug as possible. + int debug = 0; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + module_param(debug, int, 0444); ++#else ++MODULE_PARM(debug, "i"); ++#endif + MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off."); + + static char *ifname = NULL ; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + module_param(ifname, charp, 0444); ++#else ++MODULE_PARM(ifname, "s"); ++#endif + MODULE_PARM_DESC(ifname, "Network device name (default ra%d)"); + + static dma_addr_t dma_adapter; diff --git a/package/rt61/patches/01-wireless_extensions_version.patch b/package/rt61/patches/01-wireless_extensions_version.patch deleted file mode 100644 index b0e254a908..0000000000 --- a/package/rt61/patches/01-wireless_extensions_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN rt61-1.1.0-b1/Module/rtmp_main.c rt61-1.1.0-b1.new/Module/rtmp_main.c ---- rt61-1.1.0-b1/Module/rtmp_main.c 2006-06-18 10:58:40.000000000 +0200 -+++ rt61-1.1.0-b1.new/Module/rtmp_main.c 2006-12-17 19:59:10.000000000 +0100 -@@ -252,7 +252,7 @@ - net_dev->stop = RT61_close; - net_dev->get_stats = RT61_get_ether_stats; - --#if WIRELESS_EXT >= 12 -+#if WIRELESS_EXT >= 12 && WIRELESS_EXT < 21 - net_dev->get_wireless_stats = RT61_get_wireless_stats; - net_dev->wireless_handlers = (struct iw_handler_def *) &rt61_iw_handler_def; - #endif diff --git a/package/rt61/patches/02-linux_2_4_module_param.patch b/package/rt61/patches/02-linux_2_4_module_param.patch deleted file mode 100644 index ee773a856a..0000000000 --- a/package/rt61/patches/02-linux_2_4_module_param.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- rt61-old/Module/rtmp_main.c 2006/06/16 11:12:40 1.14 -+++ rt61-new/Module/rtmp_main.c 2006/08/12 13:03:25 1.15 -@@ -48,11 +48,19 @@ - // Global variable, debug level flag - // Don't hide this behing debug define. There should be as little difference between debug and no-debug as possible. - int debug = 0; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - module_param(debug, int, 0444); -+#else -+MODULE_PARM(debug, "i"); -+#endif - MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off."); - - static char *ifname = NULL ; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - module_param(ifname, charp, 0444); -+#else -+MODULE_PARM(ifname, "s"); -+#endif - MODULE_PARM_DESC(ifname, "Network device name (default ra%d)"); - - static dma_addr_t dma_adapter; -- cgit v1.2.3