Browse Source

net: fec: remove useless fep->opened

napi_disable() waits until the NAPI processing has completed, and then
prevents any further polls.  At this point, the driver then clears
fep->opened.  The NAPI poll function uses this to stop processing in
the receive path.  Hence, it will never see this variable cleared,
because the NAPI poll has to complete before it will be cleared.

Therefore, this variable serves no purpose, so let's remove it.

Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Russell King 11 năm trước cách đây
mục cha
commit
5d165c5543

+ 0 - 1
drivers/net/ethernet/freescale/fec.h

@@ -308,7 +308,6 @@ struct fec_enet_private {
 
 
 	struct	platform_device *pdev;
 	struct	platform_device *pdev;
 
 
-	int	opened;
 	int	dev_id;
 	int	dev_id;
 
 
 	/* Phylib and MDIO interface */
 	/* Phylib and MDIO interface */

+ 0 - 5
drivers/net/ethernet/freescale/fec_main.c

@@ -1215,9 +1215,6 @@ fec_enet_rx(struct net_device *ndev, int budget)
 		if ((status & BD_ENET_RX_LAST) == 0)
 		if ((status & BD_ENET_RX_LAST) == 0)
 			netdev_err(ndev, "rcv is not +last\n");
 			netdev_err(ndev, "rcv is not +last\n");
 
 
-		if (!fep->opened)
-			goto rx_processing_done;
-
 		/* Check for errors. */
 		/* Check for errors. */
 		if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
 		if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
 			   BD_ENET_RX_CR | BD_ENET_RX_OV)) {
 			   BD_ENET_RX_CR | BD_ENET_RX_OV)) {
@@ -2172,7 +2169,6 @@ fec_enet_open(struct net_device *ndev)
 	napi_enable(&fep->napi);
 	napi_enable(&fep->napi);
 	phy_start(fep->phy_dev);
 	phy_start(fep->phy_dev);
 	netif_start_queue(ndev);
 	netif_start_queue(ndev);
-	fep->opened = 1;
 	return 0;
 	return 0;
 }
 }
 
 
@@ -2185,7 +2181,6 @@ fec_enet_close(struct net_device *ndev)
 
 
 	/* Don't know what to do yet. */
 	/* Don't know what to do yet. */
 	napi_disable(&fep->napi);
 	napi_disable(&fep->napi);
-	fep->opened = 0;
 	netif_tx_disable(ndev);
 	netif_tx_disable(ndev);
 	fec_stop(ndev);
 	fec_stop(ndev);