From e71825c2b179eb0e2fa4e7cf46921875cafb2962 Mon Sep 17 00:00:00 2001
From: CleverMouse <theclevermouse@yandex.ru>
Date: Tue, 10 Nov 2009 11:49:07 +0000
Subject: [PATCH] * fixed return value for udp send() * added required
 zero-initialization of some fields in pcnet driver * fixed debug output in
 pcnet driver

git-svn-id: svn://kolibrios.org@1263 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/net/drivers/pcnet32.asm | 9 +++++++--
 kernel/branches/net/network/socket.inc  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/branches/net/drivers/pcnet32.asm b/kernel/branches/net/drivers/pcnet32.asm
index 7886728940..e881af01c5 100644
--- a/kernel/branches/net/drivers/pcnet32.asm
+++ b/kernel/branches/net/drivers/pcnet32.asm
@@ -634,6 +634,8 @@ proc service_proc stdcall, ioctl:dword
 	mov	[edi + buf_head.base], eax
 	mov	[edi + buf_head.length], PCNET_PKT_BUF_SZ_NEG
 	mov	[edi + buf_head.status], 0x8000
+	and	dword [edi + buf_head.msg_length], 0
+	and	dword [edi + buf_head.reserved], 0
 	add	eax, PCNET_PKT_BUF_SZ
 ;        inc     eax
 	add	 edi, buf_head.size
@@ -645,6 +647,9 @@ proc service_proc stdcall, ioctl:dword
 	call	GetPgAddr
   .tx_init:
 	mov	[edi + buf_head.base], eax
+	and	dword [edi + buf_head.length], 0
+	and	dword [edi + buf_head.msg_length], 0
+	and	dword [edi + buf_head.reserved], 0
 	add	eax, PCNET_PKT_BUF_SZ
 	add	edi, buf_head.size
 	loop	.tx_init
@@ -1138,7 +1143,7 @@ reset:
 ;;                                         ;;
 ;; Transmit                                ;;
 ;;                                         ;;
-;; In: buffer pointer in [esp+4]             ;;
+;; In: buffer pointer in [esp+4]           ;;
 ;;     size of buffer in [esp+8]           ;;
 ;;     pointer to device structure in ebx  ;;
 ;;                                         ;;
@@ -1146,7 +1151,7 @@ reset:
 
 align 4
 transmit:
-	DEBUGF	1,"Transmitting packet, buffer:%x, size:%u\n",[esp],[esp+4]
+	DEBUGF	1,"Transmitting packet, buffer:%x, size:%u\n",[esp+4],[esp+8]
 	mov	eax, [esp+4]
 	DEBUGF	1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
 	[eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
diff --git a/kernel/branches/net/network/socket.inc b/kernel/branches/net/network/socket.inc
index b5b45ea55a..1f9766543f 100644
--- a/kernel/branches/net/network/socket.inc
+++ b/kernel/branches/net/network/socket.inc
@@ -665,7 +665,7 @@ socket_send:
 
 	call	UDP_socket_send
 
-	mov	[esp+32], eax
+	and	dword [esp+32], 0
 	ret
 
   .tcp: