diff options
author | Anton Blanchard <anton@samba.org> | 2011-10-14 01:31:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:00:55 -0400 |
commit | 30e2e90b4de735769c8c9dc2397388fdf305e5ca (patch) | |
tree | 3440093b6c0d0b900e1ab101744574f3a40c4432 /drivers/net/ethernet/ibm | |
parent | 13946f5e4eefd5162733a75c03bb9f52c9c69614 (diff) |
ehea: Simplify type 3 transmit routine
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>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 0fc0ae8b830f..289ad4d31f1d 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -2087,27 +2087,14 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev, | |||
2087 | static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, | 2087 | static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, |
2088 | struct ehea_swqe *swqe) | 2088 | struct ehea_swqe *swqe) |
2089 | { | 2089 | { |
2090 | int nfrags = skb_shinfo(skb)->nr_frags; | ||
2091 | u8 *imm_data = &swqe->u.immdata_nodesc.immediate_data[0]; | 2090 | u8 *imm_data = &swqe->u.immdata_nodesc.immediate_data[0]; |
2092 | skb_frag_t *frag; | ||
2093 | int i; | ||
2094 | 2091 | ||
2095 | xmit_common(skb, swqe); | 2092 | xmit_common(skb, swqe); |
2096 | 2093 | ||
2097 | if (nfrags == 0) { | 2094 | if (!skb->data_len) |
2098 | skb_copy_from_linear_data(skb, imm_data, skb->len); | 2095 | skb_copy_from_linear_data(skb, imm_data, skb->len); |
2099 | } else { | 2096 | else |
2100 | skb_copy_from_linear_data(skb, imm_data, | 2097 | skb_copy_bits(skb, 0, imm_data, skb->len); |
2101 | skb_headlen(skb)); | ||
2102 | imm_data += skb_headlen(skb); | ||
2103 | |||
2104 | /* ... then copy data from the fragments */ | ||
2105 | for (i = 0; i < nfrags; i++) { | ||
2106 | frag = &skb_shinfo(skb)->frags[i]; | ||
2107 | memcpy(imm_data, skb_frag_address(frag), frag->size); | ||
2108 | imm_data += frag->size; | ||
2109 | } | ||
2110 | } | ||
2111 | 2098 | ||
2112 | swqe->immediate_data_length = skb->len; | 2099 | swqe->immediate_data_length = skb->len; |
2113 | dev_kfree_skb(skb); | 2100 | dev_kfree_skb(skb); |