X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/9c86d6da946b19a513ab554ee12473360d38d93d..7e946b3ca6587d82be1b900ee83a23a1caf7d77e:/net/net.c?ds=inline diff --git a/net/net.c b/net/net.c index 3e6130f..25926af 100644 --- a/net/net.c +++ b/net/net.c @@ -25,11 +25,35 @@ static struct netif _netif; extern struct pci_driver a3c90x_driver; -void eth_poll() +void eth_recv(struct nic *nic, struct pbuf *p) { - struct pbuf *p; struct eth_hdr *ethhdr; + + LINK_STATS_INC(link.recv); + + ethhdr = p->payload; + + switch (htons(ethhdr->type)) { + case ETHTYPE_IP: + case ETHTYPE_ARP: + if (_netif.input(p, &_netif) != ERR_OK) + { + LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n")); + pbuf_free(p); + } + break; + + default: + outputf("Unhandled packet type %04x input", ethhdr->type); + pbuf_free(p); + break; + } +} + +void eth_poll() +{ 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; @@ -44,29 +68,12 @@ void eth_poll() tcp_tmr(); ticks++; - if ((p = _nic->recv(_nic)) != NULL) + while (i > 0) { - outputf("NIC: Packet: %d bytes", p->tot_len); - - LINK_STATS_INC(link.recv); - - ethhdr = p->payload; - - switch (htons(ethhdr->type)) { - case ETHTYPE_IP: - case ETHTYPE_ARP: - if (_netif.input(p, &_netif) != ERR_OK) - { - LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n")); - pbuf_free(p); - } - break; - - default: - outputf("Unhandled packet type %04x input", ethhdr->type); - pbuf_free(p); + int n = _nic->recv(_nic); + i -= n; + if (n == 0) break; - } } } @@ -74,9 +81,9 @@ static err_t _transmit(struct netif *netif, struct pbuf *p) { struct nic *nic = netif->state; - outputf("NIC: Transmit packet"); +// outputf("NIC: Transmit packet"); - nic->transmit(p); + nic->transmit(nic, p); LINK_STATS_INC(link.xmit);