summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-02-28 15:02:15 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:17:18 +0100
commitb062afbe20f28efbc5897bbf4ccef10e194db298 (patch)
tree02d7c1273b052bd4eb9b0895684d335b57a2ceda
parentd4f438d24ee26daa223f5f34546d49709a1f0c19 (diff)
net/mlx4: && vs & typo
commit b2d0fe35471d1a71471f99147ffb5986bd60e744 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-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 95263a5705f4..4a78bdee4ed4 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -81,7 +81,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;
}
}