From 2ad1aefdd6deb0e3cd77767c54acc2ba438180ac Mon Sep 17 00:00:00 2001 From: Waldemar Kornewald Date: Wed, 3 Sep 2003 14:12:33 +0000 Subject: [PATCH] Added an emtpy line to the jamfiles. Replaced spawn_kernel_thread with spawn_thread (KernelExport.h will do the distinction between kernel mode and userland). Changed PPPLCP::Send(). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4468 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/net/ppp/Jamfile | 3 ++- src/tests/kits/net/ppp/src/Jamfile | 1 + src/tests/kits/net/ppp/src/KPPPInterface.cpp | 4 ++-- src/tests/kits/net/ppp/src/KPPPLCP.cpp | 8 +++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/tests/kits/net/ppp/Jamfile b/src/tests/kits/net/ppp/Jamfile index ddbcc0730f..254b5d54f1 100644 --- a/src/tests/kits/net/ppp/Jamfile +++ b/src/tests/kits/net/ppp/Jamfile @@ -1,3 +1,4 @@ SubDir OBOS_TOP src tests kits net ppp ; -SubInclude OBOS_TOP src tests kits net ppp src ; \ No newline at end of file +SubInclude OBOS_TOP src tests kits net ppp src ; + diff --git a/src/tests/kits/net/ppp/src/Jamfile b/src/tests/kits/net/ppp/src/Jamfile index 360ff0602d..2394551b26 100644 --- a/src/tests/kits/net/ppp/src/Jamfile +++ b/src/tests/kits/net/ppp/src/Jamfile @@ -22,3 +22,4 @@ R5KernelStaticLibrary kernelppp : settings_tools.cpp cpp.cpp ; + diff --git a/src/tests/kits/net/ppp/src/KPPPInterface.cpp b/src/tests/kits/net/ppp/src/KPPPInterface.cpp index 8f95fda200..ff102eaf62 100644 --- a/src/tests/kits/net/ppp/src/KPPPInterface.cpp +++ b/src/tests/kits/net/ppp/src/KPPPInterface.cpp @@ -56,7 +56,7 @@ PPPInterface::PPPInterface(uint32 ID, driver_settings *settings, { // set up queue fInQueue = start_ifq(); - fInQueueThread = spawn_kernel_thread(in_queue_thread, "PPPInterface: Input", + fInQueueThread = spawn_thread(in_queue_thread, "PPPInterface: Input", B_NORMAL_PRIORITY, this); resume_thread(fInQueueThread); @@ -1137,7 +1137,7 @@ PPPInterface::Redial() info->interface = this; info->thread = &fRedialThread; - fRedialThread = spawn_kernel_thread(redial_func, "PPPInterface: redial_thread", + fRedialThread = spawn_thread(redial_func, "PPPInterface: redial_thread", B_NORMAL_PRIORITY, info); resume_thread(fRedialThread); diff --git a/src/tests/kits/net/ppp/src/KPPPLCP.cpp b/src/tests/kits/net/ppp/src/KPPPLCP.cpp index da5ae7c497..21f8ece531 100644 --- a/src/tests/kits/net/ppp/src/KPPPLCP.cpp +++ b/src/tests/kits/net/ppp/src/KPPPLCP.cpp @@ -111,10 +111,12 @@ PPPLCP::Down() status_t PPPLCP::Send(struct mbuf *packet) { - if(!Interface()) + if(Target()) + return Target()->Send(packet, PPP_LCP_PROTOCOL); + else if(Interface()) + return Interface()->Send(packet, PPP_LCP_PROTOCOL); + else return B_ERROR; - - return Interface()->Send(packet, PPP_LCP_PROTOCOL); }