Commit f6b35d66 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: et131x: clean up MP_FLAG macros 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 356c74b4

drivers/staging/et131x/et1310_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev) 
	writel(ctl.value, &etdev->regs->txmac.ctl.value);



	/* Ready to start the RXDMA/TXDMA engine */

	if (!MP_TEST_FLAG(etdev, fMP_ADAPTER_LOWER_POWER)) {

	if (etdev->Flags & fMP_ADAPTER_LOWER_POWER) {

		et131x_rx_dma_enable(etdev);

		et131x_tx_dma_enable(etdev);

	} else {

drivers/staging/et131x/et1310_phy.c

+3 −5
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, 
			spin_lock_irqsave(&etdev->Lock, flags);



			etdev->MediaState = NETIF_STATUS_MEDIA_CONNECT;

			MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LINK_DETECTION);

			etdev->Flags &= ~fMP_ADAPTER_LINK_DETECTION;



			spin_unlock_irqrestore(&etdev->Lock, flags);
@@ -529,10 +529,8 @@ void et131x_Mii_check(struct et131x_adapter *etdev, 
			 * Timer expires, we can report disconnected (handled

			 * in the LinkDetectionDPC).

			 */

			if ((MP_IS_FLAG_CLEAR

			     (etdev, fMP_ADAPTER_LINK_DETECTION))

			    || (etdev->MediaState ==

				NETIF_STATUS_MEDIA_DISCONNECT)) {

			if (!(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) ||

			  (etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) {

				spin_lock_irqsave(&etdev->Lock, flags);

				etdev->MediaState =

				    NETIF_STATUS_MEDIA_DISCONNECT;

drivers/staging/et131x/et1310_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void EnablePhyComa(struct et131x_adapter *etdev) 


	/* Stop sending packets. */

	spin_lock_irqsave(&etdev->SendHWLock, flags);

	MP_SET_FLAG(etdev, fMP_ADAPTER_LOWER_POWER);

	etdev->Flags |= fMP_ADAPTER_LOWER_POWER;

	spin_unlock_irqrestore(&etdev->SendHWLock, flags);



	/* Wait for outstanding Receive packets */
@@ -189,7 +189,7 @@ void DisablePhyComa(struct et131x_adapter *etdev) 
	et131x_adapter_setup(etdev);



	/* Allow Tx to restart */

	MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LOWER_POWER);

	etdev->Flags &= ~fMP_ADAPTER_LOWER_POWER;



	/* Need to re-enable Rx. */

	et131x_rx_dma_enable(etdev);

drivers/staging/et131x/et1310_rx.c

+6 −6
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) 
						   SLAB_HWCACHE_ALIGN,

						   NULL);



	MP_SET_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE);

	adapter->Flags |= fMP_ADAPTER_RECV_LOOKASIDE;



	/* The RFDs are going to be put on lists later on, so initialize the

	 * lists now.
@@ -569,9 +569,9 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter) 
	/* Free receive packet pool */



	/* Destroy the lookaside (RFD) pool */

	if (MP_TEST_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE)) {

	if (adapter->Flags & fMP_ADAPTER_RECV_LOOKASIDE) {

		kmem_cache_destroy(rx_ring->RecvLookaside);

		MP_CLEAR_FLAG(adapter, fMP_ADAPTER_RECV_LOOKASIDE);

		adapter->Flags &= ~fMP_ADAPTER_RECV_LOOKASIDE;

	}



	/* Free the FBR Lookup Table */
@@ -1223,9 +1223,9 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) 
		 * If length is zero, return the RFD in order to advance the

		 * Free buffer ring.

		 */

		if ((!etdev->PacketFilter) ||

		    (!MP_LINK_DETECTED(etdev)) ||

		    (pMpRfd->PacketSize == 0)) {

		if (!etdev->PacketFilter ||

		    !(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) ||

		    pMpRfd->PacketSize == 0) {

			continue;

		}

drivers/staging/et131x/et1310_tx.c

+4 −4
Original line number Diff line number Diff line
@@ -510,9 +510,9 @@ static int et131x_send_packet(struct sk_buff *skb, 


		if ((shbufva[0] == 0xffff) &&

		    (shbufva[1] == 0xffff) && (shbufva[2] == 0xffff)) {

			MP_SET_FLAG(pMpTcb, fMP_DEST_BROAD);

			pMpTcb->Flags |= fMP_DEST_BROAD;

		} else if ((shbufva[0] & 0x3) == 0x0001) {

			MP_SET_FLAG(pMpTcb, fMP_DEST_MULTI);

			pMpTcb->Flags |=  fMP_DEST_MULTI;

		}

	}
@@ -1232,9 +1232,9 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev, 
	TX_DESC_ENTRY_t *desc = NULL;

	struct net_device_stats *stats = &etdev->net_stats;



	if (MP_TEST_FLAG(pMpTcb, fMP_DEST_BROAD))

	if (pMpTcb->Flags & fMP_DEST_BROAD)

		atomic_inc(&etdev->Stats.brdcstxmt);

	else if (MP_TEST_FLAG(pMpTcb, fMP_DEST_MULTI))

	else if (pMpTcb->Flags & fMP_DEST_MULTI)

		atomic_inc(&etdev->Stats.multixmt);

	else

		atomic_inc(&etdev->Stats.unixmt);