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

wctc4xxp: Trivial removal of the receiveprep function.

Browse Source 
This was more a holdover when the AN983 interface was brought over from the
voicebus driver.

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-08 16:45:36 -05:00 committed by Russ Meyerriecks
parent b5ac763f29
commit cbe4825d1a
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2505,23 +2505,6 @@ queue_rtp_packet(struct wcdte *wc, struct tcb *cmd)
return; return;
} }
static inline void
wctc4xxp_receiveprep(struct wcdte *wc, struct tcb *cmd)
{
const struct ethhdr *ethhdr = (const struct ethhdr *)(cmd->data);
if (cpu_to_be16(ETH_P_IP) == ethhdr->h_proto) {
queue_rtp_packet(wc, cmd);
} else if (cpu_to_be16(ETH_P_CSM_ENCAPS) == ethhdr->h_proto) {
receive_csm_encaps_packet(wc, cmd);
} else {
DTE_DEBUG(DTE_DEBUG_GENERAL,
"Unknown packet protocol received: %04x.\n",
be16_to_cpu(ethhdr->h_proto));
free_cmd(cmd);
}
}
static void service_tx_ring(struct wcdte *wc) static void service_tx_ring(struct wcdte *wc)
{ {
struct tcb *cmd; struct tcb *cmd;
@ -2571,11 +2554,23 @@ static void service_rx_ring(struct wcdte *wc)
* Process the received packets * Process the received packets
*/ */
while (!list_empty(&local_list)) { while (!list_empty(&local_list)) {
const struct ethhdr *ethhdr;
cmd = container_of(local_list.next, struct tcb, node); cmd = container_of(local_list.next, struct tcb, node);
ethhdr = (const struct ethhdr *)(cmd->data);
list_del_init(&cmd->node); list_del_init(&cmd->node);
wctc4xxp_net_capture_cmd(wc, cmd); wctc4xxp_net_capture_cmd(wc, cmd);
wctc4xxp_receiveprep(wc, cmd); if (cpu_to_be16(ETH_P_IP) == ethhdr->h_proto) {
queue_rtp_packet(wc, cmd);
} else if (cpu_to_be16(ETH_P_CSM_ENCAPS) == ethhdr->h_proto) {
receive_csm_encaps_packet(wc, cmd);
} else {
DTE_DEBUG(DTE_DEBUG_GENERAL,
"Unknown packet protocol received: %04x.\n",
be16_to_cpu(ethhdr->h_proto));
free_cmd(cmd);
}
} }
wctc4xxp_receive_demand_poll(wc); wctc4xxp_receive_demand_poll(wc);
} }