Commit 861e82d5 authored by Jacob Kiefer's avatar Jacob Kiefer Committed by Greg Kroah-Hartman

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: default avatarJacob Kiefer <jtk54@cornell.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 364b91be
...@@ -396,10 +396,12 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -396,10 +396,12 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
/* Check if we can use the hardware checksumming */ /* Check if we can use the hardware checksumming */
if ((skb->protocol == htons(ETH_P_IP)) && if ((skb->protocol == htons(ETH_P_IP)) &&
(ip_hdr(skb)->version == 4) && (ip_hdr(skb)->ihl == 5) && (ip_hdr(skb)->version == 4) &&
((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == htons(1 << 14))) (ip_hdr(skb)->ihl == 5) &&
&& ((ip_hdr(skb)->protocol == IPPROTO_TCP) ((ip_hdr(skb)->frag_off == 0) ||
|| (ip_hdr(skb)->protocol == IPPROTO_UDP))) { (ip_hdr(skb)->frag_off == htons(1 << 14))) &&
((ip_hdr(skb)->protocol == IPPROTO_TCP) ||
(ip_hdr(skb)->protocol == IPPROTO_UDP))) {
/* Use hardware checksum calc */ /* Use hardware checksum calc */
pko_command.s.ipoffp1 = sizeof(struct ethhdr) + 1; pko_command.s.ipoffp1 = sizeof(struct ethhdr) + 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment