Be more quiet about this whole transmit and receive business. This time, we actually...

diff --git a/net/3c90x.c b/net/3c90x.c
index 74035e0fad0ada4e4c4842bfcf783da076259dd0..936f2973513d72c7b8980d3e4cb9018b84d1f85f 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -454,8 +454,7 @@ static void a3c90x_reset(void)
  *** size - size of the non-header part of the packet that needs transmitted;
  *** pkt - the pointer to the packet data itself.
  ***/
  *** size - size of the non-header part of the packet that needs transmitted;
  *** pkt - the pointer to the packet data itself.
  ***/

-static void
-a3c90x_transmit(struct pbuf *p)
+static void _transmit(struct pbuf *p)

 {
        unsigned char status;
        static struct pbuf *oldpbuf = NULL;
 {
        unsigned char status;
        static struct pbuf *oldpbuf = NULL;


@@ -494,8 +493,6 @@ a3c90x_transmit(struct pbuf *p)
        /** set notification for transmission completion (bit 15) **/
        txdesc.hdr = (len) | 0x8000;
        
        /** set notification for transmission completion (bit 15) **/
        txdesc.hdr = (len) | 0x8000;
        

-       outputf("3c90x: Sending %d byte %d seg packet", len, n);
-

        /** Send the packet **/
        outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
        /** Send the packet **/
        outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);


@@ -580,7 +577,7 @@ static void _setup_recv(struct nic *nic)
  *** copy the packet to nic->packet if it gets a packet and set the size
  *** in nic->packetlen.  Return 1 if a packet was found.
  ***/
  *** copy the packet to nic->packet if it gets a packet and set the size
  *** in nic->packetlen.  Return 1 if a packet was found.
  ***/

-static struct pbuf * a3c90x_poll(struct nic *nic)
+static struct pbuf * _recv(struct nic *nic)

 {
        int errcode;
        struct pbuf *p;
 {
        int errcode;
        struct pbuf *p;


@@ -925,8 +922,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/
     _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/

-    nic.recv     = a3c90x_poll;
-    nic.transmit = a3c90x_transmit;
+    nic.recv     = _recv;
+    nic.transmit = _transmit;

     memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);
 
     memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);
 

diff --git a/net/net.c b/net/net.c
index 3e6130f382b259a9c41a826dfef52f11e76a8b0f..5d0c75b4ebb69d767bc73231711beafbc6845e26 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -46,7 +46,7 @@ void eth_poll()
 
        if ((p = _nic->recv(_nic)) != NULL)
        {
 
        if ((p = _nic->recv(_nic)) != NULL)
        {

-               outputf("NIC: Packet: %d bytes", p->tot_len);
+//             outputf("NIC: Packet: %d bytes", p->tot_len);

                        
                LINK_STATS_INC(link.recv);
                
                        
                LINK_STATS_INC(link.recv);
                


@@ -74,7 +74,7 @@ static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
        struct nic *nic = netif->state;
 
 {
        struct nic *nic = netif->state;
 

-       outputf("NIC: Transmit packet");
+//     outputf("NIC: Transmit packet");

 
        nic->transmit(p);
 
 
        nic->transmit(p);