diff --git a/Asuro.iso b/Asuro.iso index 22ed69a6..264e8027 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index bec21ed4..a9746edd 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index bec21ed4..a9746edd 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index 0c92f2b0..d98027fa 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/eth2.ppu b/lib/eth2.ppu index d36a06de..c376b59f 100644 Binary files a/lib/eth2.ppu and b/lib/eth2.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index a93e2ae4..c94de31f 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 128e3a43..f888c004 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 4cca910b..c1e9781f 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/shell.ppu b/lib/shell.ppu index e7924060..8ce7d92a 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index 2a8a7783..5c31afa1 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/driver/net/l2/eth2.pas b/src/driver/net/l2/eth2.pas index 3cd19e99..42567d63 100644 --- a/src/driver/net/l2/eth2.pas +++ b/src/driver/net/l2/eth2.pas @@ -36,12 +36,15 @@ procedure send(p_data : void; p_len : uint16; eth_type : uint16; p_context : PPa var buffer : void; hdr : TEthernetHeader; + pad : sint32; begin + pad:= 46 - p_len; + if pad < 0 then pad:= 0; push_trace('eth2.send'); writeToLogLn(' L2: eth2.send'); if p_context <> nil then begin - buffer:= kalloc(p_len + sizeof(TEthernetHeader)); + buffer:= kalloc(pad + p_len + sizeof(TEthernetHeader) + pad); copyMAC(@p_context^.MAC.Source[0], @hdr.src[0]); copyMAC(@p_context^.MAC.Destination[0], @hdr.dst[0]); hdr.EthTypeHi:= eth_type SHR 8; diff --git a/src/include/asuro.pas b/src/include/asuro.pas index fc90c8e9..44b9e5aa 100644 --- a/src/include/asuro.pas +++ b/src/include/asuro.pas @@ -9,14 +9,14 @@ const VERSION_SUB = '1'; REVISION = '677'; RELEASE = 'ia'; - LINE_COUNT = 27904; + LINE_COUNT = 27907; FILE_COUNT = 89; DRIVER_COUNT = 32; FPC_VERSION = '2.6.4'; NASM_VERSION = '2.10.09'; MAKE_VERSION = '3.81'; COMPILE_DATE = '10/05/18'; - COMPILE_TIME = '14:21:06'; + COMPILE_TIME = '14:53:45'; implementation