Module Name: src
Committed By: phx
Date: Fri Apr 29 22:21:36 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: rge.c
Log Message:
When we stretch a short frame to 60 bytes in rge_send() do not return 60,
but the original frame size.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/altboot/rge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/altboot/rge.c
diff -u src/sys/arch/sandpoint/stand/altboot/rge.c:1.4 src/sys/arch/sandpoint/stand/altboot/rge.c:1.5
--- src/sys/arch/sandpoint/stand/altboot/rge.c:1.4 Mon Apr 4 16:41:34 2011
+++ src/sys/arch/sandpoint/stand/altboot/rge.c Fri Apr 29 22:21:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rge.c,v 1.4 2011/04/04 16:41:34 phx Exp $ */
+/* $NetBSD: rge.c,v 1.5 2011/04/29 22:21:36 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -217,8 +217,9 @@
{
struct local *l = dev;
volatile struct desc *txd;
- unsigned loop;
+ unsigned loop, ret;
+ ret = len;
if (len < 60) {
memset(buf + len, 0, 60 - len);
len = 60; /* RTL does not stretch <60 Tx frame */
@@ -241,7 +242,7 @@
return -1;
done:
l->tx ^= 1;
- return len;
+ return ret;
}
int
