Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Bananymous:e77de1804f4c229fb8fea3277c6f0c80c71243ae
Branches Tags
Bananymous:main
..
compare: Bananymous:ee8fca94392b246bfcbdd5945cfe498d74faed92
Branches Tags
Bananymous:main

No commits in common. "e77de1804f4c229fb8fea3277c6f0c80c71243ae" and "ee8fca94392b246bfcbdd5945cfe498d74faed92" have entirely different histories.
e77de1804f ... ee8fca9439

2 changed files with 4 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
kernel/kernel/Networking/E1000/E1000.cpp
View File

@ -290,7 +290,7 @@ namespace Kernel
void E1000::handle_irq() void E1000::handle_irq()
{ {
if (!(read32(REG_ICR) & ICR_RxQ0)) if (read32(REG_ICR) & ICR_RxQ0)
return; return;
SpinLockGuard _(m_lock); SpinLockGuard _(m_lock);

5
kernel/kernel/Networking/TCPSocket.cpp
View File

@ -438,8 +438,10 @@ namespace Kernel
{ {
LockGuard _(m_mutex); LockGuard _(m_mutex);
if (m_should_ack.compare_exchange(true, false)) if (m_should_ack)
{ {
m_should_ack = false;
ASSERT(m_connection_info.has_value()); ASSERT(m_connection_info.has_value());
auto* target_address = reinterpret_cast<const sockaddr*>(&m_connection_info->address); auto* target_address = reinterpret_cast<const sockaddr*>(&m_connection_info->address);
auto target_address_len = m_connection_info->address_len; auto target_address_len = m_connection_info->address_len;
@ -508,7 +510,6 @@ namespace Kernel
} }
} }
m_semaphore.unblock();
m_semaphore.block_with_wake_time(current_ms + retransmit_timeout_ms); m_semaphore.block_with_wake_time(current_ms + retransmit_timeout_ms);
} }