|
@@ -446,7 +446,8 @@ static void nat_poll ( struct net_device *netdev, unsigned int rx_quota ) {
|
446
|
446
|
/* check the status of packets given to card for transmission */
|
447
|
447
|
for ( i = 0 ; i < TX_RING_SIZE ; i++ )
|
448
|
448
|
{
|
449
|
|
- status=(uint32_t)bus_to_virt(nat->tx[nat->tx_dirty].cmdsts);
|
|
449
|
+ //status=(uint32_t)bus_to_virt(nat->tx[nat->tx_dirty].cmdsts);
|
|
450
|
+ status=(uint32_t)nat->tx[nat->tx_dirty].cmdsts;
|
450
|
451
|
/* check if current packet has been transmitted or not */
|
451
|
452
|
if(status & OWN)
|
452
|
453
|
break;
|
|
@@ -454,12 +455,12 @@ static void nat_poll ( struct net_device *netdev, unsigned int rx_quota ) {
|
454
|
455
|
if (! (status & DescPktOK))
|
455
|
456
|
{
|
456
|
457
|
printf("Error in sending Packet with data: %s\n and status:%X\n",
|
457
|
|
- (char *)bus_to_virt(nat->tx[nat->tx_dirty].bufptr),(unsigned int)status);
|
|
458
|
+ (char *)nat->tx[nat->tx_dirty].bufptr,(unsigned int)status);
|
458
|
459
|
}
|
459
|
460
|
else
|
460
|
461
|
{
|
461
|
462
|
DBG("Success in transmitting Packet with data: %s",
|
462
|
|
- (char *)bus_to_virt(nat->tx[nat->tx_dirty].bufptr));
|
|
463
|
+ (char *)nat->tx[nat->tx_dirty].bufptr);
|
463
|
464
|
}
|
464
|
465
|
/* setting cmdsts zero, indicating that it can be reused */
|
465
|
466
|
nat->tx[nat->tx_dirty].cmdsts=0;
|
|
@@ -467,7 +468,8 @@ static void nat_poll ( struct net_device *netdev, unsigned int rx_quota ) {
|
467
|
468
|
}
|
468
|
469
|
|
469
|
470
|
|
470
|
|
- rx_status=(unsigned int)bus_to_virt(nat->rx[nat->rx_cur].cmdsts);
|
|
471
|
+ //rx_status=(unsigned int)bus_to_virt(nat->rx[nat->rx_cur].cmdsts);
|
|
472
|
+ rx_status=(unsigned int)nat->rx[nat->rx_cur].cmdsts;
|
471
|
473
|
/* Handle received packets */
|
472
|
474
|
while (rx_quota && (rx_status & OWN))
|
473
|
475
|
{
|
|
@@ -477,7 +479,8 @@ static void nat_poll ( struct net_device *netdev, unsigned int rx_quota ) {
|
477
|
479
|
if((rx_status & (DescMore|DescPktOK|RxTooLong)) != DescPktOK)
|
478
|
480
|
{
|
479
|
481
|
printf("natsemi_poll: Corrupted packet received, "
|
480
|
|
- "buffer status = %X\n",rx_status);
|
|
482
|
+ "buffer status = %X ^ %X \n",rx_status,
|
|
483
|
+ (unsigned int) nat->rx[nat->rx_cur].cmdsts);
|
481
|
484
|
}
|
482
|
485
|
else
|
483
|
486
|
{
|
|
@@ -493,6 +496,8 @@ static void nat_poll ( struct net_device *netdev, unsigned int rx_quota ) {
|
493
|
496
|
}
|
494
|
497
|
nat->rx[nat->rx_cur].cmdsts = RX_BUF_SIZE;
|
495
|
498
|
nat->rx_cur=(nat->rx_cur+1) % NUM_RX_DESC;
|
|
499
|
+ //rx_status=(unsigned int)bus_to_virt(nat->rx[nat->rx_cur].cmdsts);
|
|
500
|
+ rx_status=(unsigned int)nat->rx[nat->rx_cur].cmdsts;
|
496
|
501
|
}
|
497
|
502
|
|
498
|
503
|
|