summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-02-28 13:02:15 +0100
committerDavid S. Miller <davem@davemloft.net>2017-03-01 18:50:58 +0100
commitb2d0fe35471d1a71471f99147ffb5986bd60e744 (patch)
treef7980f13a111f3555f1081fd95c2348306ec8306 /include
parentnet: usb: asix_devices: fix missing return code check on call to asix_write_m... (diff)
downloadlinux-b2d0fe35471d1a71471f99147ffb5986bd60e744.tar.xz
linux-b2d0fe35471d1a71471f99147ffb5986bd60e744.zip
net/mlx4: && vs & typo
Bitwise & was obviously intended here. Fixes: 745d8ae4622c ("net/mlx4: Spoofcheck and zero MAC can't coexist") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mlx4/driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index e965e5090d96..a858bcb6220b 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -109,7 +109,7 @@ static inline void mlx4_u64_to_mac(u8 *addr, u64 mac)
int i;
for (i = ETH_ALEN; i > 0; i--) {
- addr[i - 1] = mac && 0xFF;
+ addr[i - 1] = mac & 0xFF;
mac >>= 8;
}
}