[PATCH] staging: style fix for octeon/ethernet-tx.c

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Jacob Kiefer <jtk54@cornell.edu>
Newsgroups	linux.kernel
Subject	[PATCH] staging: style fix for octeon/ethernet-tx.c
Date	Fri, 10 Jul 2015 02:50:02 +0200
Message-ID	<pKuFQ-7if-13@gated-at.bofh.it> (permalink)
X-Original-To	unlisted-recipients:; (no To-header on input)
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7ZH9TSoeVP4/js+8tOLaHbjcc9CjyeVYqpmZjOF8m6k=; b=ZuqTdxkGuoAFrlhuEm8b6+Inxush51tUKlOoJp4fwJUXNmWE+/sNBjb5S7EcC57CAr LWMtnN0wq5FaJvHbW7AHFMJyEyr/bZJluWVQZFgAEL/qOGpebdfyl/etqCoNfzN94Tir 4OjIjGa9B9qWjc4ZvDhgWOEO0FvrODbsuCOSmi/yMLMwSWj28bBj1+A5FI9zzKzb6IM3 oZb2IdjQOVvJ0FPYsN7fYBhx97oVjjAO/2Uid97GkgyB52BqYgfoilHaBoGBAs5WLPw5 +XUNuVuTqSM0Wcmy8okvYGXBB95pTt/wbEwssnGnFaEJ41JTwXqOunUyE0qkuhCPCzco e5tQ==
X-Gm-Message-State	ALoCoQleQ6lsAhzDigyVAW33N/x310SJd3HWFb/sgaRPlM31EaAZPiOWeca5aulAzHD8zNCeRBQ+
X-Received	by 10.140.235.19 with SMTP id g19mr30499548qhc.52.1436489213847; Thu, 09 Jul 2015 17:46:53 -0700 (PDT)
X-Google-Original-From	Jacob Kiefer
X-Mailer	git-send-email 1.8.3.2
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	38
Organization	linux.* mail to news gateway
X-Original-Cc	Jacob Kiefer <jtk54@cornell.edu>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Aaro Koskinen <aaro.koskinen@iki.fi>, Paul Martin <paul.martin@codethink.co.uk>, Ralf Baechle <ralf@linux-mips.org>, Roberto Medina <robertoxmed@gmail.com>, devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list)
X-Original-Date	Thu, 9 Jul 2015 20:46:04 -0400
X-Original-Message-ID	<1436489166-23039-1-git-send-email-jtk54@cornell.edu>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1181144

Show key headers only | View raw

From: Jacob Kiefer <jtk54@cornell.edu>

Style fix for octeon/ethernet-tx.c

Signed-off-by: Jacob Kiefer <jtk54@cornell.edu>
---
 drivers/staging/octeon/ethernet-tx.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 7c1c1b0..e2df041 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -396,10 +396,12 @@ dont_put_skbuff_in_hw:
 
 	/* Check if we can use the hardware checksumming */
 	if ((skb->protocol == htons(ETH_P_IP)) &&
-	    (ip_hdr(skb)->version == 4) && (ip_hdr(skb)->ihl == 5) &&
-	    ((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == htons(1 << 14)))
-	    && ((ip_hdr(skb)->protocol == IPPROTO_TCP)
-		|| (ip_hdr(skb)->protocol == IPPROTO_UDP))) {
+	    (ip_hdr(skb)->version == 4) &&
+	    (ip_hdr(skb)->ihl == 5) &&
+	    ((ip_hdr(skb)->frag_off == 0) ||
+	     (ip_hdr(skb)->frag_off == htons(1 << 14))) &&
+	    ((ip_hdr(skb)->protocol == IPPROTO_TCP) ||
+	     (ip_hdr(skb)->protocol == IPPROTO_UDP))) {
 		/* Use hardware checksum calc */
 		pko_command.s.ipoffp1 = sizeof(struct ethhdr) + 1;
 	}
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] staging: style fix for octeon/ethernet-tx.c Jacob Kiefer <jtk54@cornell.edu> - 2015-07-10 02:50 +0200

csiph-web