sorry, forgot to put [patch] in the subject of the last one ;)

this one is cc: to lkml until test9* comes out.

-d


--
"The difference between 'involvement' and 'commitment' is like an
eggs-and-ham breakfast: the chicken was 'involved' - the pig was
'committed'."


--- 8139too.c.old       Thu Sep  7 23:50:14 2000
+++ 8139too.c   Sat Sep  9 18:43:31 2000
@@ -25,6 +25,8 @@
                        posted MMIO write bugginess
 
                Gerard Sharp - bug fix
+               
+               David Ford - ring offset miscalculation
 
        Submitting bug reports:
 
@@ -97,7 +99,7 @@
 #include <asm/io.h>
 
 
-#define RTL8139_VERSION "0.9.8"
+#define RTL8139_VERSION "0.9.9"
 #define RTL8139_MODULE_NAME "8139too"
 #define RTL8139_DRIVER_NAME   RTL8139_MODULE_NAME " Fast Ethernet driver " 
RTL8139_VERSION
 #define PFX RTL8139_MODULE_NAME ": "
@@ -1674,13 +1676,12 @@
                        skb->dev = dev;
                        skb_reserve (skb, 2);   /* 16 byte align the IP fields. */
 
-                       if (ring_offset + rx_size + 4 > RX_BUF_LEN) {
+                       if (ring_offset + pkt_size + 4 > RX_BUF_LEN) {
                                int semi_count =
                                    RX_BUF_LEN - ring_offset - 4;
                                /* This could presumably use two calls to 
copy_and_sum()? */
                                memcpy (skb_put (skb, semi_count),
-                                       &rx_ring[ring_offset + 4],
-                                       semi_count);
+                                       &rx_ring[ring_offset + 4], semi_count);
                                memcpy (skb_put (skb, pkt_size - semi_count),
                                        rx_ring, pkt_size - semi_count);
 #ifdef RTL8139_DEBUG
begin:vcard 
n:Ford;David
x-mozilla-html:TRUE
org:<img src="http://www.kalifornia.com/images/paradise.jpg">
adr:;;;;;;
version:2.1
email;internet:[EMAIL PROTECTED]
title:Blue Labs Developer
x-mozilla-cpt:;28256
fn:David Ford
end:vcard

Reply via email to