Remove unnecessary check in drivers/net/depca.c
PATCH 1/1 Remove unnecessary check in drivers/net/depca.c
hi,
this was spotted by coverity (cid #793). All callers dereference dev before calling this functions, and we dereference it earlier in the function, when initializing lp.
Signed-off-by Eric Sesterhenn <[email protected]>
drivers/net/depca.c renamed from drivers/net/depca.c.orig +13 -15
@@ -1252,24 +1252,22 @@ static void set_multicast_list(struct nestruct depca_private *lp = (struct depca_private *) dev->priv;u_long ioaddr = dev->base_addr; -if (dev) { -netif_stop_queue (dev); -while (lp->tx_old != lp->tx_new);/* Wait for the ring to empty */ +netif_stop_queue (dev); +while (lp->tx_old != lp->tx_new);/* Wait for the ring to empty */ -STOP_DEPCA ;/* Temporarily stop the depca. */ -depca_init_ring (dev);/* Initialize the descriptor rings */ - -if (dev->flags &IFF_PROMISC ) {/* Set promiscuous mode */ - lp->init_block.mode |=PROM ; - }else { -SetMulticastFilter (dev); - lp->init_block.mode &= ~PROM ;/* Unset promiscuous mode */ - } +STOP_DEPCA ;/* Temporarily stop the depca. */ +depca_init_ring (dev);/* Initialize the descriptor rings */ -LoadCSRs (dev);/* Reload CSR3 */ -InitRestartDepca (dev);/* Resume normal operation. */ -netif_start_queue (dev);/* Unlock the TX ring */ +if (dev->flags &IFF_PROMISC ) {/* Set promiscuous mode */ + lp->init_block.mode |=PROM ; + }else { +SetMulticastFilter (dev); + lp->init_block.mode &= ~PROM ;/* Unset promiscuous mode */ } + +LoadCSRs (dev);/* Reload CSR3 */ +InitRestartDepca (dev);/* Resume normal operation. */ +netif_start_queue (dev);/* Unlock the TX ring */ }/*