import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / nfp / nfp_net_ctrl.h

diff --git a/ceph/src/spdk/dpdk/drivers/net/nfp/nfp_net_ctrl.h b/ceph/src/spdk/dpdk/drivers/net/nfp/nfp_net_ctrl.h
index 21e17da1c0311ebd572c7790461a900a9752eb0f..fc3540a2e9cf5f0e2bb4b87d62fcaa8e5e0903f8 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/nfp/nfp_net_ctrl.h
+++ b/ceph/src/spdk/dpdk/drivers/net/nfp/nfp_net_ctrl.h
@@ -122,7 +122,7 @@
 #define   NFP_NET_CFG_CTRL_MSIX_TX_OFF    (0x1 << 26) /* Disable MSIX for TX */
 #define   NFP_NET_CFG_CTRL_LSO2           (0x1 << 28) /* LSO/TSO (version 2) */
 #define   NFP_NET_CFG_CTRL_RSS2           (0x1 << 29) /* RSS (version 2) */
-#define   NFP_NET_CFG_CTRL_LIVE_ADDR      (0x1 << 31) /* live MAC addr change */
+#define   NFP_NET_CFG_CTRL_LIVE_ADDR      (0x1U << 31)/* live MAC addr change */
 #define NFP_NET_CFG_UPDATE              0x0004
 #define   NFP_NET_CFG_UPDATE_GEN          (0x1 <<  0) /* General update */
 #define   NFP_NET_CFG_UPDATE_RING         (0x1 <<  1) /* Ring config change */
@@ -135,7 +135,7 @@
 #define   NFP_NET_CFG_UPDATE_IRQMOD       (0x1 <<  8) /* IRQ mod change */
 #define   NFP_NET_CFG_UPDATE_VXLAN        (0x1 <<  9) /* VXLAN port change */
 #define   NFP_NET_CFG_UPDATE_MACADDR      (0x1 << 11) /* MAC address change */
-#define   NFP_NET_CFG_UPDATE_ERR          (0x1 << 31) /* A error occurred */
+#define   NFP_NET_CFG_UPDATE_ERR          (0x1U << 31) /* A error occurred */
 #define NFP_NET_CFG_TXRS_ENABLE         0x0008
 #define NFP_NET_CFG_RXRS_ENABLE         0x0010
 #define NFP_NET_CFG_MTU                 0x0018