Skip to content

Commit 649c81a

Browse files
committed
Kernel: Move networking related files into Kernel/Net/.
1 parent 718bea7 commit 649c81a

26 files changed

+60
-62
lines changed

Kernel/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ KERNEL_OBJS = \
3434
PS2MouseDevice.o \
3535
Socket.o \
3636
LocalSocket.o \
37-
IPv4Socket.o \
38-
TCPSocket.o \
39-
UDPSocket.o \
40-
NetworkAdapter.o \
41-
E1000NetworkAdapter.o \
37+
Net/IPv4Socket.o \
38+
Net/TCPSocket.o \
39+
Net/UDPSocket.o \
40+
Net/NetworkAdapter.o \
41+
Net/E1000NetworkAdapter.o \
4242
Net/LoopbackAdapter.o \
4343
Net/Routing.o \
44-
NetworkTask.o
44+
Net/NetworkTask.o
4545

4646
VFS_OBJS = \
4747
DiskDevice.o \

Kernel/ARP.h renamed to Kernel/Net/ARP.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <Kernel/MACAddress.h>
4-
#include <Kernel/IPv4.h>
5-
#include <Kernel/EtherType.h>
3+
#include <Kernel/Net/MACAddress.h>
4+
#include <Kernel/Net/IPv4.h>
5+
#include <Kernel/Net/EtherType.h>
66

77
struct ARPOperation {
88
enum : word {

Kernel/E1000NetworkAdapter.cpp renamed to Kernel/Net/E1000NetworkAdapter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Kernel/E1000NetworkAdapter.h>
1+
#include <Kernel/Net/E1000NetworkAdapter.h>
22
#include <Kernel/PCI.h>
33
#include <Kernel/IO.h>
44

Kernel/E1000NetworkAdapter.h renamed to Kernel/Net/E1000NetworkAdapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <Kernel/NetworkAdapter.h>
3+
#include <Kernel/Net/NetworkAdapter.h>
44
#include <Kernel/PCI.h>
55
#include <Kernel/MemoryManager.h>
66
#include <Kernel/IRQHandler.h>
File renamed without changes.

Kernel/EthernetFrameHeader.h renamed to Kernel/Net/EthernetFrameHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <Kernel/MACAddress.h>
3+
#include <Kernel/Net/MACAddress.h>
44
#include <Kernel/NetworkOrdered.h>
55

66
class [[gnu::packed]] EthernetFrameHeader {

Kernel/ICMP.h renamed to Kernel/Net/ICMP.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <Kernel/MACAddress.h>
4-
#include <Kernel/IPv4.h>
3+
#include <Kernel/Net/MACAddress.h>
4+
#include <Kernel/Net/IPv4.h>
55

66
struct ICMPType {
77
enum {
File renamed without changes.

Kernel/IPv4Socket.cpp renamed to Kernel/Net/IPv4Socket.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#include <Kernel/IPv4Socket.h>
2-
#include <Kernel/TCPSocket.h>
3-
#include <Kernel/UDPSocket.h>
1+
#include <Kernel/Net/IPv4Socket.h>
2+
#include <Kernel/Net/TCPSocket.h>
3+
#include <Kernel/Net/UDPSocket.h>
44
#include <Kernel/UnixTypes.h>
55
#include <Kernel/Process.h>
6-
#include <Kernel/NetworkAdapter.h>
7-
#include <Kernel/IPv4.h>
8-
#include <Kernel/ICMP.h>
9-
#include <Kernel/TCP.h>
10-
#include <Kernel/UDP.h>
11-
#include <Kernel/ARP.h>
6+
#include <Kernel/Net/NetworkAdapter.h>
7+
#include <Kernel/Net/IPv4.h>
8+
#include <Kernel/Net/ICMP.h>
9+
#include <Kernel/Net/TCP.h>
10+
#include <Kernel/Net/UDP.h>
11+
#include <Kernel/Net/ARP.h>
1212
#include <Kernel/Net/Routing.h>
1313
#include <LibC/errno_numbers.h>
1414

Kernel/IPv4Socket.h renamed to Kernel/Net/IPv4Socket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <Kernel/Socket.h>
44
#include <Kernel/DoubleBuffer.h>
5-
#include <Kernel/IPv4.h>
5+
#include <Kernel/Net/IPv4.h>
66
#include <AK/HashMap.h>
77
#include <Kernel/Lock.h>
88
#include <AK/SinglyLinkedList.h>

0 commit comments

Comments
 (0)