summaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon
diff options
context:
space:
mode:
authorJacob Kiefer <jtk54@cornell.edu>2015-07-10 01:26:30 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-14 20:18:56 -0700
commit861e82d5b5a42d2eda34f3123b46162eaae9af80 (patch)
tree3abb129ce97632ff25baaeff70e866a3fd874a34 /drivers/staging/octeon
parent364b91be262aaf0afc1726be391fbeb7f2b59c52 (diff)
downloadblackbird-op-linux-861e82d5b5a42d2eda34f3123b46162eaae9af80.tar.gz
blackbird-op-linux-861e82d5b5a42d2eda34f3123b46162eaae9af80.zip
staging: style fix for octeon/ethernet-tx.c
Broke line with greater than 80 characters into two lines and improved logical operator readability in hardware checksum if statement. Signed-off-by: Jacob Kiefer <jtk54@cornell.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r--drivers/staging/octeon/ethernet-tx.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 7c1c1b052b7d..e2df041ca82d 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;
}
OpenPOWER on IntegriCloud