diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/l2tpns/patches/patch-l2tpns_c | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/l2tpns/patches/patch-l2tpns_c')
| -rw-r--r-- | package/l2tpns/patches/patch-l2tpns_c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/l2tpns/patches/patch-l2tpns_c b/package/l2tpns/patches/patch-l2tpns_c new file mode 100644 index 000000000..3aa12107d --- /dev/null +++ b/package/l2tpns/patches/patch-l2tpns_c @@ -0,0 +1,35 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- l2tpns-2.1.21.orig/l2tpns.c 2006-06-22 17:30:50.000000000 +0200 ++++ l2tpns-2.1.21/l2tpns.c 2009-05-29 17:53:32.393095004 +0200 +@@ -4233,31 +4233,6 @@ int main(int argc, char *argv[]) + chdir("/tmp"); + } + +- if (config->scheduler_fifo) +- { +- int ret; +- struct sched_param params = {0}; +- params.sched_priority = 1; +- +- if (get_nprocs() < 2) +- { +- LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n"); +- config->scheduler_fifo = 0; +- } +- else +- { +- if ((ret = sched_setscheduler(0, SCHED_FIFO, ¶ms)) == 0) +- { +- LOG(1, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n"); +- } +- else +- { +- LOG(0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno)); +- config->scheduler_fifo = 0; +- } +- } +- } +- + /* Set up the cluster communications port. */ + if (cluster_init() < 0) + exit(1); |