From patchwork Fri Nov 30 22:31:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Gallatin X-Patchwork-Id: 203064 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 252A82C0081 for ; Sat, 1 Dec 2012 09:31:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064Ab2K3Wbj (ORCPT ); Fri, 30 Nov 2012 17:31:39 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:63571 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752302Ab2K3Wbi (ORCPT ); Fri, 30 Nov 2012 17:31:38 -0500 Received: by mail-gg0-f174.google.com with SMTP id k2so158605ggd.19 for ; Fri, 30 Nov 2012 14:31:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=VDi6wHcQfcz+0goWvow1QzrzEbgnMXTKDuyXV/s/PuM=; b=kEBbjrDfK81FPKsI7cy4T3Gf0za0jdnf8UcT1Th2GgEuRVNk1Ec4VGFZ844SBuFbW+ Wp4jdNU4dyV5FJ4Li5wbg2WdBaDbQS1UeJSTUJUYioEjy7e74XFdNw96EvNHUONW46+y PsQSCIIFzI0PzBNHnR3Akk5pLkaBYOzm9y8mjH/MhEvjhYpUyFwbLmK8EWGtQu+CdGNX BPLwAHbsS3rHi3SJ/b/6UQtNtfRlr/jmL70b1kfTRSpbb2IXK9AAlvN9wxlgt16IjRAL 5zIK45WjsLsMEb1vqqf6LNKh9CDP9r6AoUYiB9D67j/urmhP7hn/b99LhMD+NSwUXPfX W+TQ== Received: by 10.236.134.18 with SMTP id r18mr3209688yhi.45.1354314697536; Fri, 30 Nov 2012 14:31:37 -0800 (PST) Received: from drogon.sw.myri.com (c-24-125-204-77.hsd1.va.comcast.net. [24.125.204.77]) by mx.google.com with ESMTPS id f15sm6260684yhi.11.2012.11.30.14.31.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Nov 2012 14:31:36 -0800 (PST) From: Andrew Gallatin To: davem@davemloft.net Cc: netdev@vger.kernel.org, Andrew Gallatin Subject: [PATCH net-next] myri10ge: fix incorrect use of ntohs() Date: Fri, 30 Nov 2012 17:31:26 -0500 Message-Id: <1354314686-16149-1-git-send-email-gallatin@myri.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQkuEVFt5GLYvoQ03BR0CHRijWfDAH+/dhbR8Zkv8WZasepxWN8xOIWJVpEj7Z0gfdKFvV6n Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 1b4c44e6369dbbafd113f1e00b406f1eda5ab5b2 incorrectly used ntohs() rather than htons() in myri10ge_vlan_rx(). Thanks to Fengguang Wu, Yuanhan Liu's kernel-build tester for pointing out this bug. Signed-off-by: Andrew Gallatin --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 2fc984a..a40234e 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -1283,7 +1283,7 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb) va += MXGEFW_PAD; veh = (struct vlan_ethhdr *)va; if ((dev->features & NETIF_F_HW_VLAN_RX) == NETIF_F_HW_VLAN_RX && - veh->h_vlan_proto == ntohs(ETH_P_8021Q)) { + veh->h_vlan_proto == htons(ETH_P_8021Q)) { /* fixup csum if needed */ if (skb->ip_summed == CHECKSUM_COMPLETE) { vsum = csum_partial(va + ETH_HLEN, VLAN_HLEN, 0);