summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2019-07-25 09:28:07 +0000
committermsaitoh <msaitoh@NetBSD.org>2019-07-25 09:28:07 +0000
commitf1787120ebbee803e2b8859b8a91e6baedde61cb (patch)
tree82f54b74ebe70dac16cc5f8bccdc3cd118e8ccf1 /sys/dev
parenta7970fc8ae83cf466b33a7e79f136d2337745c43 (diff)
Fix VLAN hardware filter initialization. Use unsigned. Found by KUBSan.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/ixgbe/ixgbe.c4
-rw-r--r--sys/dev/pci/ixgbe/ixv.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index 716976257e0..62ddd3e3762 100644
--- a/sys/dev/pci/ixgbe/ixgbe.c
+++ b/sys/dev/pci/ixgbe/ixgbe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.195 2019/07/25 09:01:56 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.196 2019/07/25 09:28:07 msaitoh Exp $ */
/******************************************************************************
@@ -2427,7 +2427,7 @@ ixgbe_setup_vlan_hw_support(struct adapter *adapter)
idx = vlanidp->vid / 32;
KASSERT(idx < IXGBE_VFTA_SIZE);
- adapter->shadow_vfta[idx] |= 1 << vlanidp->vid % 32;
+ adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32);
}
mutex_exit(ec->ec_lock);
for (i = 0; i < IXGBE_VFTA_SIZE; i++)
diff --git a/sys/dev/pci/ixgbe/ixv.c b/sys/dev/pci/ixgbe/ixv.c
index 9280aaab539..296db70cbf5 100644
--- a/sys/dev/pci/ixgbe/ixv.c
+++ b/sys/dev/pci/ixgbe/ixv.c
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.122 2019/07/25 09:01:56 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.123 2019/07/25 09:28:07 msaitoh Exp $*/
/******************************************************************************
@@ -1993,7 +1993,7 @@ ixv_setup_vlan_support(struct adapter *adapter)
idx = vlanidp->vid / 32;
KASSERT(idx < IXGBE_VFTA_SIZE);
- adapter->shadow_vfta[idx] |= 1 << vlanidp->vid % 32;
+ adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32);
}
mutex_exit(ec->ec_lock);
@@ -2012,7 +2012,7 @@ ixv_setup_vlan_support(struct adapter *adapter)
*/
for (int j = 0; j < 32; j++) {
retry = 0;
- if ((vfta & (1 << j)) == 0)
+ if ((vfta & ((u32)1 << j)) == 0)
continue;
vid = (i * 32) + j;