diff options
| author | Werner Almesberger <werner@openmoko.org> | 2009-03-31 00:49:46 -0300 |
|---|---|---|
| committer | Werner Almesberger <werner@openmoko.org> | 2009-03-31 00:49:46 -0300 |
| commit | 0213cae5cbda64977b86396a3a79269ab047aa1b (patch) | |
| tree | 948fe4a4fd2578c15af5f5a0736ca25b00da92ff /drivers/ar6000 | |
| parent | 645df9d63189968bb3884d46f6558c3e2b0c935a (diff) | |
Minor AR6000 cleanup
This patch cleans up a little after Ivan's netif_queue_stop fix.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'drivers/ar6000')
| -rw-r--r-- | drivers/ar6000/ar6000/ar6000_drv.c | 5 | ||||
| -rw-r--r-- | drivers/ar6000/htc/htc.c | 4 | ||||
| -rw-r--r-- | drivers/ar6000/htc/htc_send.c | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ar6000/ar6000/ar6000_drv.c b/drivers/ar6000/ar6000/ar6000_drv.c index cdf05d1b314..21504f221dd 100644 --- a/drivers/ar6000/ar6000/ar6000_drv.c +++ b/drivers/ar6000/ar6000/ar6000_drv.c @@ -1759,7 +1759,7 @@ applyAPTCHeuristics(AR_SOFTC_T *ar) static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint) { - AR_SOFTC_T *ar = (AR_SOFTC_T *)Context; + AR_SOFTC_T *ar = (AR_SOFTC_T *) Context; if (Endpoint == arWMIStream2EndpointID(ar,WMI_CONTROL_PRI)) { if (!bypasswmi) { @@ -1789,9 +1789,8 @@ ar6000_tx_queue_avail(void *Context, HTC_ENDPOINT_ID Endpoint) /* FIXME: what do for it? */ } else { /* Wake up interface, rescheduling prevented. */ - if ((ar->arConnected == TRUE) || (bypasswmi)) { + if (ar->arConnected == TRUE || bypasswmi) netif_wake_queue(ar->arNetDev); - } } } diff --git a/drivers/ar6000/htc/htc.c b/drivers/ar6000/htc/htc.c index 63ef90bf916..d52ed944e0d 100644 --- a/drivers/ar6000/htc/htc.c +++ b/drivers/ar6000/htc/htc.c @@ -283,8 +283,8 @@ A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle) connect.EpCallbacks.EpTxComplete = HTCControlTxComplete; connect.EpCallbacks.EpRecv = HTCControlRecv; connect.EpCallbacks.EpRecvRefill = NULL; /* not needed */ - connect.EpCallbacks.EpSendFull = NULL; /* not nedded */ - connect.EpCallbacks.EpSendAvail = NULL; /* not nedded */ + connect.EpCallbacks.EpSendFull = NULL; /* not needed */ + connect.EpCallbacks.EpSendAvail = NULL; /* not needed */ connect.MaxSendQueueDepth = NUM_CONTROL_BUFFERS; connect.ServiceID = HTC_CTRL_RSVD_SVC; diff --git a/drivers/ar6000/htc/htc_send.c b/drivers/ar6000/htc/htc_send.c index 62d8bcda5e2..cf0dabef472 100644 --- a/drivers/ar6000/htc/htc_send.c +++ b/drivers/ar6000/htc/htc_send.c @@ -219,9 +219,8 @@ static void HTCTrySend(HTC_TARGET *target, } else { UNLOCK_HTC_TX(target); /* queue is now available for new packet, let caller know */ - if (pEndpoint->EpCallBacks.EpSendAvail) { + if (pEndpoint->EpCallBacks.EpSendAvail) pEndpoint->EpCallBacks.EpSendAvail(pEndpoint->EpCallBacks.pContext, ep); - } } AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("-HTCTrySend: \n")); |