FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wctc4xxp: Make sure csm_encaps commands are sent before RTP.

Browse Source 
Otherwise, if there are many RTP commands queued on the command list, some of
the CSM_ENCAP packets, like ACKS, weren't being sent to the firmware within the
timeout value.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
This commit is contained in:
Shaun Ruffell 2014-05-09 09:46:26 -05:00 committed by Russ Meyerriecks
parent 67e422c1ef
commit 0efce00a09
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/dahdi/wctc4xxp/base.c
View File

@ -1548,6 +1548,12 @@ static void wctc4xxp_cleanup_command_list(struct wcdte *wc)
} }
} }
static inline bool is_rtp_packet(const struct tcb *cmd)
{
const struct ethhdr *ethhdr = cmd->data;
return (cpu_to_be16(ETH_P_IP) == ethhdr->h_proto);
}
static void static void
wctc4xxp_transmit_cmd(struct wcdte *wc, struct tcb *cmd) wctc4xxp_transmit_cmd(struct wcdte *wc, struct tcb *cmd)
{ {
@ -1591,6 +1597,14 @@ wctc4xxp_transmit_cmd(struct wcdte *wc, struct tcb *cmd)
list_add_tail(&cmd->node, &wc->waiting_for_response_list); list_add_tail(&cmd->node, &wc->waiting_for_response_list);
mod_timer(&wc->watchdog, jiffies + HZ/2); mod_timer(&wc->watchdog, jiffies + HZ/2);
} }
if (!list_empty(&wc->cmd_list)) {
if (is_rtp_packet(cmd))
list_add_tail(&cmd->node, &wc->cmd_list);
else
list_move(&cmd->node, &wc->cmd_list);
spin_unlock_irqrestore(&wc->cmd_list_lock, flags);
return;
}
res = wctc4xxp_submit(wc->txd, cmd); res = wctc4xxp_submit(wc->txd, cmd);
if (-EBUSY == res) { if (-EBUSY == res) {
/* Looks like we're out of room in the descriptor /* Looks like we're out of room in the descriptor
@ -2482,6 +2496,7 @@ static void service_tx_ring(struct wcdte *wc)
struct tcb *cmd; struct tcb *cmd;
unsigned long flags; unsigned long flags;
while ((cmd = wctc4xxp_retrieve(wc->txd))) { while ((cmd = wctc4xxp_retrieve(wc->txd))) {
spin_lock_irqsave(&wc->cmd_list_lock, flags);
cmd->flags |= TX_COMPLETE; cmd->flags |= TX_COMPLETE;
if (!(cmd->flags & (WAIT_FOR_ACK | WAIT_FOR_RESPONSE))) { if (!(cmd->flags & (WAIT_FOR_ACK | WAIT_FOR_RESPONSE))) {
/* If we're not waiting for an ACK or Response from /* If we're not waiting for an ACK or Response from
@ -2499,17 +2514,16 @@ static void service_tx_ring(struct wcdte *wc)
/* We've freed up a spot in the hardware ring buffer. If /* We've freed up a spot in the hardware ring buffer. If
* another packet is queued up, let's submit it to the * another packet is queued up, let's submit it to the
* hardware. */ * hardware. */
spin_lock_irqsave(&wc->cmd_list_lock, flags);
if (!list_empty(&wc->cmd_list)) { if (!list_empty(&wc->cmd_list)) {
cmd = list_entry(wc->cmd_list.next, struct tcb, node); cmd = list_entry(wc->cmd_list.next, struct tcb, node);
list_del_init(&cmd->node); list_del_init(&cmd->node);
} else { if (cmd->flags & (WAIT_FOR_ACK | WAIT_FOR_RESPONSE)) {
cmd = NULL; list_add_tail(&cmd->node,
&wc->waiting_for_response_list);
}
wctc4xxp_submit(wc->txd, cmd);
} }
spin_unlock_irqrestore(&wc->cmd_list_lock, flags); spin_unlock_irqrestore(&wc->cmd_list_lock, flags);
if (cmd)
wctc4xxp_transmit_cmd(wc, cmd);
} }
} }