|
168 | 168 |
|
169 | 169 | #define MPFS_TXTIMEOUT (60 * CLK_TCK)
|
170 | 170 |
|
171 |
| -/* RX timeout = 30s */ |
172 |
| - |
173 |
| -#define MPFS_RXTIMEOUT (30 * CLK_TCK) |
174 |
| - |
175 | 171 | /* PHY reset tim in loop counts */
|
176 | 172 |
|
177 | 173 | #define PHY_RESET_WAIT_COUNT (10)
|
@@ -269,7 +265,6 @@ struct mpfs_ethmac_s
|
269 | 265 | uint8_t phyaddr; /* PHY address */
|
270 | 266 | #endif
|
271 | 267 | struct wdog_s txtimeout; /* TX timeout timer */
|
272 |
| - struct wdog_s rxtimeout; /* RX timeout timer */ |
273 | 268 | struct work_s irqwork; /* For deferring interrupt work to the work queue */
|
274 | 269 | struct work_s pollwork; /* For deferring poll work to the work queue */
|
275 | 270 | struct work_s timeoutwork; /* For managing timeouts */
|
@@ -392,7 +387,6 @@ static int mpfs_ethconfig(struct mpfs_ethmac_s *priv);
|
392 | 387 | static void mpfs_ethreset(struct mpfs_ethmac_s *priv);
|
393 | 388 |
|
394 | 389 | static void mpfs_interrupt_work(void *arg);
|
395 |
| -static void mpfs_txtimeout_expiry(wdparm_t arg); |
396 | 390 |
|
397 | 391 | /****************************************************************************
|
398 | 392 | * Private Functions
|
@@ -474,14 +468,6 @@ static int mpfs_interrupt_0(int irq, void *context, void *arg)
|
474 | 468 | wd_cancel(&priv->txtimeout);
|
475 | 469 | }
|
476 | 470 |
|
477 |
| - if ((isr & GEM_INT_RECEIVE_COMPLETE) != 0) |
478 |
| - { |
479 |
| - /* If a RX transfer just completed, restart the timeout */ |
480 |
| - |
481 |
| - wd_start(&priv->rxtimeout, MPFS_RXTIMEOUT, |
482 |
| - mpfs_txtimeout_expiry, (wdparm_t)priv); |
483 |
| - } |
484 |
| - |
485 | 471 | /* Schedule to perform the interrupt processing on the worker thread. */
|
486 | 472 |
|
487 | 473 | work_queue(ETHWORK, &priv->irqwork, mpfs_interrupt_work, priv, 0);
|
@@ -1570,13 +1556,6 @@ static int mpfs_ifup(struct net_driver_s *dev)
|
1570 | 1556 | up_enable_irq(priv->mac_q_int[2]);
|
1571 | 1557 | up_enable_irq(priv->mac_q_int[3]);
|
1572 | 1558 |
|
1573 |
| - /* Set up the RX timeout. If we don't receive anything in time, try |
1574 |
| - * to re-initialize |
1575 |
| - */ |
1576 |
| - |
1577 |
| - wd_start(&priv->rxtimeout, MPFS_RXTIMEOUT, |
1578 |
| - mpfs_txtimeout_expiry, (wdparm_t)priv); |
1579 |
| - |
1580 | 1559 | return OK;
|
1581 | 1560 | }
|
1582 | 1561 |
|
@@ -1620,10 +1599,6 @@ static int mpfs_ifdown(struct net_driver_s *dev)
|
1620 | 1599 |
|
1621 | 1600 | wd_cancel(&priv->txtimeout);
|
1622 | 1601 |
|
1623 |
| - /* Cancel the RX timeout timers */ |
1624 |
| - |
1625 |
| - wd_cancel(&priv->rxtimeout); |
1626 |
| - |
1627 | 1602 | /* Put the MAC in its reset, non-operational state. This should be
|
1628 | 1603 | * a known configuration that will guarantee the mpfs_ifup() always
|
1629 | 1604 | * successfully brings the interface back up.
|
|
0 commit comments