Staging: et131x: clean up MP_FLAG macros (f6b35d66) · Commits · jan.koester / Linux

drivers/staging/et131x/et1310_mac.c

+1 −1

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

	/* Ready to start the RXDMA/TXDMA engine */		/* 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_rx_dma_enable(etdev);
	et131x_tx_dma_enable(etdev);		et131x_tx_dma_enable(etdev);
	} else {		} else {

+3 −5

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

	etdev->MediaState = NETIF_STATUS_MEDIA_CONNECT;		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);		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		* Timer expires, we can report disconnected (handled
	* in the LinkDetectionDPC).		* in the LinkDetectionDPC).
	*/		*/
	if ((MP_IS_FLAG_CLEAR		if (!(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) \|\|
	(etdev, fMP_ADAPTER_LINK_DETECTION))		(etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) {
	\|\| (etdev->MediaState ==
	NETIF_STATUS_MEDIA_DISCONNECT)) {
	spin_lock_irqsave(&etdev->Lock, flags);		spin_lock_irqsave(&etdev->Lock, flags);
	etdev->MediaState =		etdev->MediaState =
	NETIF_STATUS_MEDIA_DISCONNECT;		NETIF_STATUS_MEDIA_DISCONNECT;

+2 −2

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

	/* Stop sending packets. */		/* Stop sending packets. */
	spin_lock_irqsave(&etdev->SendHWLock, flags);		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);		spin_unlock_irqrestore(&etdev->SendHWLock, flags);

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

	/* Allow Tx to restart */		/* Allow Tx to restart */
	MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LOWER_POWER);		etdev->Flags &= ~fMP_ADAPTER_LOWER_POWER;

	/* Need to re-enable Rx. */		/* Need to re-enable Rx. */
	et131x_rx_dma_enable(etdev);		et131x_rx_dma_enable(etdev);

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -415,7 +415,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
	SLAB_HWCACHE_ALIGN,		SLAB_HWCACHE_ALIGN,
	NULL);		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		/* The RFDs are going to be put on lists later on, so initialize the
	* lists now.		* lists now.
	@@ -569,9 +569,9 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
	/* Free receive packet pool */		/* Free receive packet pool */

	/* Destroy the lookaside (RFD) 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);		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 */		/* 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		* If length is zero, return the RFD in order to advance the
	* Free buffer ring.		* Free buffer ring.
	*/		*/
	if ((!etdev->PacketFilter) \|\|		if (!etdev->PacketFilter \|\|
	(!MP_LINK_DETECTED(etdev)) \|\|		!(etdev->Flags & fMP_ADAPTER_LINK_DETECTION) \|\|
	(pMpRfd->PacketSize == 0)) {		pMpRfd->PacketSize == 0) {
	continue;		continue;
	}		}

+4 −4

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

	if ((shbufva[0] == 0xffff) &&		if ((shbufva[0] == 0xffff) &&
	(shbufva[1] == 0xffff) && (shbufva[2] == 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) {		} 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;		TX_DESC_ENTRY_t *desc = NULL;
	struct net_device_stats *stats = &etdev->net_stats;		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);		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);		atomic_inc(&etdev->Stats.multixmt);
	else		else
	atomic_inc(&etdev->Stats.unixmt);		atomic_inc(&etdev->Stats.unixmt);