From patchwork Mon Mar 5 15:01:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 144698 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 387E7B6F9F for ; Tue, 6 Mar 2012 02:01:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932650Ab2CEPBT (ORCPT ); Mon, 5 Mar 2012 10:01:19 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:36505 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932150Ab2CEPBQ (ORCPT ); Mon, 5 Mar 2012 10:01:16 -0500 Received: by pbcun15 with SMTP id un15so2864496pbc.19 for ; Mon, 05 Mar 2012 07:01:16 -0800 (PST) Received-SPF: pass (google.com: domain of eric.dumazet@gmail.com designates 10.68.135.68 as permitted sender) client-ip=10.68.135.68; Authentication-Results: mr.google.com; spf=pass (google.com: domain of eric.dumazet@gmail.com designates 10.68.135.68 as permitted sender) smtp.mail=eric.dumazet@gmail.com; dkim=pass header.i=eric.dumazet@gmail.com Received: from mr.google.com ([10.68.135.68]) by 10.68.135.68 with SMTP id pq4mr12021808pbb.71.1330959676683 (num_hops = 1); Mon, 05 Mar 2012 07:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=J2LyJi0y0xzD/3LzY4CN/l4bMfhHm3+Pbk7Ao0mr2sg=; b=zZ3czQi7Ga4p/nxM9jsgGZ9jjEX4UiyJVGTY7qG3nWW9iKvhzYjCrL/fHNAJSl1vzb vDP6a8qkeUurfMN1hr28FDjRJFpM9k6DfoMFDBHUmXx7v4BMRQH6mNK4GDDkdBYNVfP4 su6+LCTbaoyFyv1UUJ7323prqsq7T3xDM49vSIqjDoTqqG+cBzRFRzeOxGgT/JIwrZwn vPzUWc6JvG6W0Iia/trNwYPO19skqD9j3218ZskpMnGt3GZ3vJoNdolF/OKP4XOOCumB yxIZ4rqCLGyXoB0JIw7S4PjzMeXOike/95muM0ltzRniFE9ALoLGBBmxCw+QFEHx73x8 SLFQ== Received: by 10.68.135.68 with SMTP id pq4mr10399799pbb.71.1330959676450; Mon, 05 Mar 2012 07:01:16 -0800 (PST) Received: from [10.0.0.2] (c-107-3-167-36.hsd1.ca.comcast.net. [107.3.167.36]) by mx.google.com with ESMTPS id a1sm13510809pbj.72.2012.03.05.07.01.15 (version=SSLv3 cipher=OTHER); Mon, 05 Mar 2012 07:01:15 -0800 (PST) Message-ID: <1330959674.2474.24.camel@edumazet-laptop> Subject: [PATCH net-next] mlx4_en: remove sparse errors From: Eric Dumazet To: Or Gerlitz Cc: David Miller , netdev , Yevgeny Petrilin Date: Mon, 05 Mar 2012 07:01:14 -0800 In-Reply-To: <1330876610.2730.23.camel@edumazet-laptop> References: <1330167065.2462.53.camel@edumazet-laptop> <1330876610.2730.23.camel@edumazet-laptop> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix new sparse errors introduced in commit 6221217199 (mlx4_en: dont change mac_header on xmit) Reported-by: Or Gerlitz Signed-off-by: Eric Dumazet Cc: Yevgeny Petrilin --- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 2fd5140..50b3fa5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/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 */