rt2800pci: add back ifdown hang workaround that was accidentally dropped during a...

[openwrt.git] / package / busybox / patches / 470-insmod_search.patch

diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 022ca24..8f52d98 100644 (file)
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -98,9 +98,9 @@
 +      return ret;
 +}
  
 +      return ret;
 +}
  

- int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int insmod_main(int argc UNUSED_PARAM, char **argv)
-@@ -33,9 +126,15 @@ int insmod_main(int argc UNUSED_PARAM, c
+ /* 2.6 style insmod has no options and required filename
+  * (not module name - .ko can't be omitted) */
+@@ -55,9 +148,15 @@ int insmod_main(int argc UNUSED_PARAM, c

        if (!filename)
                bb_show_usage();
  
        if (!filename)
                bb_show_usage();
  


@@ -117,14 +117,14 @@
 +done:
        return rc;
  }
 +done:
        return rc;
  }

---- a/modutils/Config.in
-+++ b/modutils/Config.in
-@@ -210,7 +210,7 @@ config FEATURE_MODUTILS_SYMBOLS
+--- a/modutils/Config.src
++++ b/modutils/Config.src
+@@ -228,7 +228,7 @@ config FEATURE_MODUTILS_SYMBOLS

  config DEFAULT_MODULES_DIR
        string "Default directory containing modules"
        default "/lib/modules"
  config DEFAULT_MODULES_DIR
        string "Default directory containing modules"
        default "/lib/modules"

--      depends on DEPMOD || MODPROBE || MODPROBE_SMALL
-+      depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL
+-      depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO
++      depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL || MODINFO

        help
          Directory that contains kernel modules.
          Defaults to "/lib/modules"
        help
          Directory that contains kernel modules.
          Defaults to "/lib/modules"