Module Name: src
Committed By: hikaru
Date: Sat Feb 13 06:12:46 UTC 2016
Modified Files:
src/sys/dev/marvell: if_mvxpe.c
Log Message:
Style.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/marvell/if_mvxpe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvxpe.c
diff -u src/sys/dev/marvell/if_mvxpe.c:1.8 src/sys/dev/marvell/if_mvxpe.c:1.9
--- src/sys/dev/marvell/if_mvxpe.c:1.8 Sat Feb 13 06:02:31 2016
+++ src/sys/dev/marvell/if_mvxpe.c Sat Feb 13 06:12:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvxpe.c,v 1.8 2016/02/13 06:02:31 hikaru Exp $ */
+/* $NetBSD: if_mvxpe.c,v 1.9 2016/02/13 06:12:46 hikaru Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.8 2016/02/13 06:02:31 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.9 2016/02/13 06:12:46 hikaru Exp $");
#include "opt_multiprocessor.h"
@@ -2622,7 +2622,7 @@ mvxpe_rx_set_csumflag(struct ifnet *ifp,
if (r->status & MVXPE_RX_L3_IP) {
csum_flags |= M_CSUM_IPv4 & ifp->if_csum_flags_rx;
if ((r->status & MVXPE_RX_IP_HEADER_OK) == 0 &&
- (csum_flags & M_CSUM_IPv4)) {
+ (csum_flags & M_CSUM_IPv4) != 0) {
csum_flags |= M_CSUM_IPv4_BAD;
goto finish;
}
@@ -2654,7 +2654,7 @@ mvxpe_rx_set_csumflag(struct ifnet *ifp,
break;
}
if ((r->status & MVXPE_RX_L4_CHECKSUM_OK) == 0 && (csum_flags &
- (M_CSUM_TCPv4 | M_CSUM_TCPv6 | M_CSUM_UDPv4 | M_CSUM_UDPv6)))
+ (M_CSUM_TCPv4 | M_CSUM_TCPv6 | M_CSUM_UDPv4 | M_CSUM_UDPv6)) != 0)
csum_flags |= M_CSUM_TCP_UDP_BAD;
finish:
m0->m_pkthdr.csum_flags = csum_flags;