From 10e9756c003223cd8e902aca342948ea166bb0c6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 27 Aug 2009 10:58:59 +0100 Subject: [PATCH] --- yaml --- r: 162501 b: refs/heads/master c: 817550815e80ff237439b1631a316bebc3023649 h: refs/heads/master i: 162499: c0422ef26bea34feea0ac8c47a208dcb61ec2e78 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_tx.c | 8 ++++---- trunk/drivers/staging/et131x/et131x_adapter.h | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 83e45110ad8d..848d5c659a4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf1aa8e1befc9eadd6911773494e59f563d01ebe +refs/heads/master: 817550815e80ff237439b1631a316bebc3023649 diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c index a017d271e375..43f5b62ab33b 100644 --- a/trunk/drivers/staging/et131x/et1310_tx.c +++ b/trunk/drivers/staging/et131x/et1310_tx.c @@ -1375,7 +1375,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *etdev) DBG_VERBOSE(et131x_dbginfo, "pMpTcb = 0x%p\n", pMpTcb); FreeCounter++; - MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); + et131x_free_send_packet(etdev, pMpTcb); spin_lock_irqsave(&etdev->TCBSendQLock, flags); @@ -1384,7 +1384,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *etdev) if (FreeCounter == NUM_TCB) { DBG_ERROR(et131x_dbginfo, - "MpFreeBusySendPackets exitted loop for a bad reason\n"); + "MpFreeBusySendPackets exited loop for a bad reason\n"); BUG(); } @@ -1451,7 +1451,7 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) etdev->TxRing.CurrSendTail = NULL; spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); - MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); + et131x_free_send_packet(etdev, pMpTcb); spin_lock_irqsave(&etdev->TCBSendQLock, flags); /* Goto the next packet */ @@ -1466,7 +1466,7 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) etdev->TxRing.CurrSendTail = NULL; spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); - MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); + et131x_free_send_packet(etdev, pMpTcb); spin_lock_irqsave(&etdev->TCBSendQLock, flags); /* Goto the next packet */ diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h index 04de4ff3e874..df4a625b43ce 100644 --- a/trunk/drivers/staging/et131x/et131x_adapter.h +++ b/trunk/drivers/staging/et131x/et131x_adapter.h @@ -333,9 +333,4 @@ struct et131x_adapter { struct net_device_stats net_stats_prev; }; -#define MPSendPacketsHandler MPSendPackets -#define MP_FREE_SEND_PACKET_FUN(Adapter, pMpTcb) \ - et131x_free_send_packet(Adapter, pMpTcb) -#define MpSendPacketFun(Adapter, Packet) MpSendPacket(Adapter, Packet) - #endif /* __ET131X_ADAPTER_H__ */