Only memcpy as much as we need to when we need to.

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 7fa7c467164715abcb3c279eeafea4d6ed67bda1..e7bb80ab50f50c61b0dd9a8ebe9a4d557bd8d14d 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -27,12 +27,10 @@ extern struct pci_driver a3c90x_driver;
 
 void eth_poll()
 {
-       unsigned char pkt[1600];
-       int len;
-       struct pbuf *p, *q;
+       struct pbuf *p;
        struct eth_hdr *ethhdr;
-       int pos = 0;
        static int ticks = 0;
+       int i = 15;     /* Don't process more than 15 packets at a time; we don't want the host to get TOO badly slowed down... */
        
        if (!_nic)
                return;
@@ -47,30 +45,10 @@ void eth_poll()
                tcp_tmr();
        ticks++;
 
-       if (_nic->poll(_nic, 0))
+       while ((i--) && ((p = _nic->recv(_nic)) != NULL))
        {
-               _nic->packet = pkt;
-               _nic->poll(_nic, 1);
-               
-               len = _nic->packetlen;
-               
-               outputf("NIC: Packet: %d bytes", len);
+//             outputf("NIC: Packet: %d bytes", p->tot_len);
                        
-               p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
-               if (p == NULL)
-               {
-                       outputf("NIC: out of memory for packet?");
-                       LINK_STATS_INC(link.memerr);
-                       LINK_STATS_INC(link.drop);
-                       return;
-               }
-       
-               for(q = p; q != NULL; q = q->next)
-               {
-                       memcpy(q->payload, pkt+pos, q->len);
-                       pos += q->len;
-               }
-               
                LINK_STATS_INC(link.recv);
                
                ethhdr = p->payload;
@@ -96,19 +74,10 @@ void eth_poll()
 static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
        struct nic *nic = netif->state;
-       struct pbuf *q;
-       unsigned char pkt[1600];
-       unsigned int len = 0;
-
-       for(q = p; q != NULL; q = q->next)
-       {
-               memcpy(pkt + len, q->payload, q->len);
-               len += q->len;
-       }
 
-       outputf("NIC: Transmit packet: %d bytes", len);
+//     outputf("NIC: Transmit packet");
 
-       nic->transmit(len, pkt);
+       nic->transmit(p);
 
        LINK_STATS_INC(link.xmit);