diff options
| author | Alan Cox | 2009-08-27 12:02:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:02:28 +0200 |
| commit | f6b35d66cf3284fd76cd3b7dd170630235ce304c (patch) | |
| tree | 096c7ac66118fc9f914e933faffb31a60b5b6b18 /drivers/staging/et131x/et1310_rx.c | |
| parent | Staging: et131x: clean up DMA10/DMA4 types (diff) | |
| download | kernel-qcow2-linux-f6b35d66cf3284fd76cd3b7dd170630235ce304c.tar.gz kernel-qcow2-linux-f6b35d66cf3284fd76cd3b7dd170630235ce304c.tar.xz kernel-qcow2-linux-f6b35d66cf3284fd76cd3b7dd170630235ce304c.zip | |
Staging: et131x: clean up MP_FLAG macros
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_rx.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_rx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c index 757a8cd45416..54a7ecfd4901 100644 --- a/drivers/staging/et131x/et1310_rx.c +++ b/drivers/staging/et131x/et1310_rx.c @@ -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; } |