From patchwork Tue Jul 10 06:56:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li RongQing X-Patchwork-Id: 170062 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 1BCF82C0079 for ; Tue, 10 Jul 2012 16:56:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753475Ab2GJG4T (ORCPT ); Tue, 10 Jul 2012 02:56:19 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:56242 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570Ab2GJG4S (ORCPT ); Tue, 10 Jul 2012 02:56:18 -0400 Received: by qadb17 with SMTP id b17so2132538qad.19 for ; Mon, 09 Jul 2012 23:56:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=c23a2Eq1ki5lHytsKAwD1E1tqCxwzJJood/jMCZFMKI=; b=dcj8JYE4sHZuc9GZUHV3T3ASN9Nlak5BXTafvIrjoD6Mi39s6Z9wg2IL8jA2z+A1sP E+UkFI+RDs9y/geVUuzLkOmc33SUdhrx92Ffh8BWAoQCOLoIkViHpogYjdab9nCyxT4h vwn/3rajfuYPXML+3iB5zXUaWsGgm9Sc7PirvMm9x9EnHIs7y4rPT8R7QblAo+uqr5Zf HO3BgrlO1JO+wWZ9Xz+cohWPNUvmNGSY4lPPxtpoRUFKS9ty033hhzhaLmPtPFlzXmlm 1u4oKpo2KbKM91aRw5SPGHgwrv5TX1HxbHz96mRMY/LL3LHqpTRZHxJl/orewWMQ16kW KlQA== Received: by 10.229.136.129 with SMTP id r1mr22887999qct.21.1341903378058; Mon, 09 Jul 2012 23:56:18 -0700 (PDT) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id gy5sm64590823qab.3.2012.07.09.23.56.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 23:56:17 -0700 (PDT) From: roy.qing.li@gmail.com To: netdev@vger.kernel.org Cc: Tristram.Ha@micrel.com, bhutchings@solarflare.com, joe@perches.com Subject: [v2 PATCH] ksz884x: fix Endian Date: Tue, 10 Jul 2012 14:56:06 +0800 Message-Id: <1341903366-15217-1-git-send-email-roy.qing.li@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing ETH_P_IP is host Endian, skb->protocol is big Endian, when compare them, Using htons on skb->protocol is wrong. And fix two code style issues: indentation and remove unnecessary parentheses. CC: Tristram Ha CC: Ben Hutchings CC: Joe Perches Signed-off-by: Li RongQing --- drivers/net/ethernet/micrel/ksz884x.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index eaf9ff0..0fbe2e2 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -4881,8 +4881,8 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev) left = hw_alloc_pkt(hw, skb->len, num); if (left) { if (left < num || - ((CHECKSUM_PARTIAL == skb->ip_summed) && - (ETH_P_IPV6 == htons(skb->protocol)))) { + (CHECKSUM_PARTIAL == skb->ip_summed && + skb->protocol == htons(ETH_P_IPV6))) { struct sk_buff *org_skb = skb; skb = netdev_alloc_skb(dev, org_skb->len);