diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-24 19:51:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-26 14:22:05 -0500 |
commit | 622121719934f60378279eb440d3cec2fc3176d2 (patch) | |
tree | ed5285b379efd994078cd2010968361bcc5759b3 /include/linux/mlx4 | |
parent | 0f298a285f2e365cb34f69d1f79bb9fc996f683d (diff) |
mlx4_en: dont change mac_header on xmit
A driver xmit function is not allowed to change skb without special
care.
mlx4_en_xmit() should not call skb_reset_mac_header() and instead should
use skb->data to access ethernet header.
This removes a dumb test : if (ethh && ethh->h_dest)
Also remove this slow mlx4_en_mac_to_u64() call, we can use
get_unaligned() to get faster code.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx4')
-rw-r--r-- | include/linux/mlx4/qp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h index bee8fa231276..091f9e7dc8b9 100644 --- a/include/linux/mlx4/qp.h +++ b/include/linux/mlx4/qp.h | |||
@@ -212,7 +212,10 @@ struct mlx4_wqe_ctrl_seg { | |||
212 | * [1] SE (solicited event) | 212 | * [1] SE (solicited event) |
213 | * [0] FL (force loopback) | 213 | * [0] FL (force loopback) |
214 | */ | 214 | */ |
215 | __be32 srcrb_flags; | 215 | union { |
216 | __be32 srcrb_flags; | ||
217 | __be16 srcrb_flags16[2]; | ||
218 | }; | ||
216 | /* | 219 | /* |
217 | * imm is immediate data for send/RDMA write w/ immediate; | 220 | * imm is immediate data for send/RDMA write w/ immediate; |
218 | * also invalidation key for send with invalidate; input | 221 | * also invalidation key for send with invalidate; input |