Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] iseries_veth: Only call dma_unmap_single() if dma_map_single() succeeded

Browse source 
The iseries_veth driver unconditionally calls dma_unmap_single() even
when the corresponding dma_map_single() may have failed.

Rework the code a bit to keep the return value from dma_unmap_single()
around, and then check if it's a dma_mapping_error() before we do
the dma_unmap_single().

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Michael Ellerman 2005-09-01 11:29:07 +10:00 • committed by Jeff Garzik
parent b08bd5c0a3
commit cbf9074cc3
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/iseries_veth.c
View file

@ -931,7 +931,6 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
struct veth_lpar_connection *cnx = veth_cnx[rlp]; struct veth_lpar_connection *cnx = veth_cnx[rlp];
struct veth_port *port = (struct veth_port *) dev->priv; struct veth_port *port = (struct veth_port *) dev->priv;
HvLpEvent_Rc rc; HvLpEvent_Rc rc;
u32 dma_address, dma_length;
struct veth_msg *msg = NULL; struct veth_msg *msg = NULL;
int err = 0; int err = 0;
unsigned long flags; unsigned long flags;
@ -959,20 +958,19 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
msg->in_use = 1; msg->in_use = 1;
dma_length = skb->len; msg->data.addr[0] = dma_map_single(port->dev, skb->data,
dma_address = dma_map_single(port->dev, skb->data, skb->len, DMA_TO_DEVICE);
dma_length, DMA_TO_DEVICE);
if (dma_mapping_error(dma_address)) if (dma_mapping_error(msg->data.addr[0]))
goto recycle_and_drop; goto recycle_and_drop;
/* Is it really necessary to check the length and address /* Is it really necessary to check the length and address
* fields of the first entry here? */ * fields of the first entry here? */
msg->skb = skb; msg->skb = skb;
msg->dev = port->dev; msg->dev = port->dev;
msg->data.addr[0] = dma_address; msg->data.len[0] = skb->len;
msg->data.len[0] = dma_length;
msg->data.eofmask = 1 << VETH_EOF_SHIFT; msg->data.eofmask = 1 << VETH_EOF_SHIFT;
rc = veth_signaldata(cnx, VethEventTypeFrames, msg->token, &msg->data); rc = veth_signaldata(cnx, VethEventTypeFrames, msg->token, &msg->data);
if (rc != HvLpEvent_Rc_Good) if (rc != HvLpEvent_Rc_Good)
@ -1076,8 +1074,9 @@ static void veth_recycle_msg(struct veth_lpar_connection *cnx,
dma_address = msg->data.addr[0]; dma_address = msg->data.addr[0];
dma_length = msg->data.len[0]; dma_length = msg->data.len[0];
dma_unmap_single(msg->dev, dma_address, dma_length, if (!dma_mapping_error(dma_address))
DMA_TO_DEVICE); dma_unmap_single(msg->dev, dma_address, dma_length,
DMA_TO_DEVICE);
if (msg->skb) { if (msg->skb) {
dev_kfree_skb_any(msg->skb); dev_kfree_skb_any(msg->skb);