From 471789a3a3733bfa88ea0a2625d855c14edbd9a2 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 5 Mar 2012 05:01:14 +0000 Subject: [PATCH] --- yaml --- r: 290781 b: refs/heads/master c: 18f973af3e7028620186d1c1ace044506bb6229e h: refs/heads/master i: 290779: 8bcadfc17e8d043fb0eba8a85cef5fb755ad5695 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c345bb616836..e18a5aabe203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c1e51a34afb110a010a73141a2b5f000f798875 +refs/heads/master: 18f973af3e7028620186d1c1ace044506bb6229e diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 2fd51405a509..50b3fa5212ed 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -686,8 +686,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) /* Copy dst mac address to wqe */ ethh = (struct ethhdr *)skb->data; - tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((u16 *)ethh->h_dest); - tx_desc->ctrl.imm = get_unaligned((u32 *)(ethh->h_dest + 2)); + tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest); + tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2)); /* Handle LSO (TSO) packets */ if (lso_header_size) { /* Mark opcode as LSO */