X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/112c8c75deab100cf02c2e9e850c9e8474ef1a92..bc9e1044fd166db4e75cdc39b2aaa17d942b3ca4:/net/net.c

diff --git a/net/net.c b/net/net.c
index 5b4072b..5d0c75b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -27,11 +27,8 @@ 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;
 	
 	if (!_nic)
@@ -47,30 +44,10 @@ void eth_poll()
 		tcp_tmr();
 	ticks++;
 
-	if (_nic->poll(_nic, 0))
+	if ((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 +73,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);
 
@@ -162,7 +130,7 @@ void eth_init()
 	smram_tseg_set_state(SMRAM_TSEG_OPEN);
 	lwip_init();
 	httpd_init();
-/*
+
 	rfb_init();
-*/
+
 }