lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ehea: Simplify type 3 transmit routine

Browse Source 
If a nonlinear skb fits within the immediate area, use skb_copy_bits
instead of copying the frags by hand.

v3:
[cascardo] fixed conflict with use of skb frag API

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anton Blanchard
2011-10-14 05:31:07 +00:00
committed by David S. Miller
parent 13946f5e4e
commit 30e2e90b4d
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/ibm/ehea/ehea_main.c
View File

@@ -2087,27 +2087,14 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev,
static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
struct ehea_swqe *swqe) struct ehea_swqe *swqe)
{ {
int nfrags = skb_shinfo(skb)->nr_frags;
u8 *imm_data = &swqe->u.immdata_nodesc.immediate_data[0]; u8 *imm_data = &swqe->u.immdata_nodesc.immediate_data[0];
skb_frag_t *frag;
int i;
xmit_common(skb, swqe); xmit_common(skb, swqe);
if (nfrags == 0) { if (!skb->data_len)
skb_copy_from_linear_data(skb, imm_data, skb->len); skb_copy_from_linear_data(skb, imm_data, skb->len);
} else { else
skb_copy_from_linear_data(skb, imm_data, skb_copy_bits(skb, 0, imm_data, skb->len);
skb_headlen(skb));
imm_data += skb_headlen(skb);
/* ... then copy data from the fragments */
for (i = 0; i < nfrags; i++) {
frag = &skb_shinfo(skb)->frags[i];
memcpy(imm_data, skb_frag_address(frag), frag->size);
imm_data += frag->size;
}
}
swqe->immediate_data_length = skb->len; swqe->immediate_data_length = skb->len;
dev_kfree_skb(skb); dev_kfree_skb(skb);