aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/emulex/benet/be.h18
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.h8
-rw-r--r--drivers/net/ethernet/emulex/benet/be_hw.h4
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 3b1d59d1bd1c..9869556f367d 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -361,15 +361,15 @@ enum vf_state {
361 ASSIGNED = 1 361 ASSIGNED = 1
362}; 362};
363 363
364#define BE_FLAGS_LINK_STATUS_INIT 1 364#define BE_FLAGS_LINK_STATUS_INIT BIT(1)
365#define BE_FLAGS_SRIOV_ENABLED (1 << 2) 365#define BE_FLAGS_SRIOV_ENABLED BIT(2)
366#define BE_FLAGS_WORKER_SCHEDULED (1 << 3) 366#define BE_FLAGS_WORKER_SCHEDULED BIT(3)
367#define BE_FLAGS_VLAN_PROMISC (1 << 4) 367#define BE_FLAGS_VLAN_PROMISC BIT(4)
368#define BE_FLAGS_MCAST_PROMISC (1 << 5) 368#define BE_FLAGS_MCAST_PROMISC BIT(5)
369#define BE_FLAGS_NAPI_ENABLED (1 << 9) 369#define BE_FLAGS_NAPI_ENABLED BIT(6)
370#define BE_FLAGS_QNQ_ASYNC_EVT_RCVD (1 << 11) 370#define BE_FLAGS_QNQ_ASYNC_EVT_RCVD BIT(7)
371#define BE_FLAGS_VXLAN_OFFLOADS (1 << 12) 371#define BE_FLAGS_VXLAN_OFFLOADS BIT(8)
372#define BE_FLAGS_SETUP_DONE (1 << 13) 372#define BE_FLAGS_SETUP_DONE BIT(9)
373 373
374#define BE_UC_PMAC_COUNT 30 374#define BE_UC_PMAC_COUNT 30
375#define BE_VF_UC_PMAC_COUNT 2 375#define BE_VF_UC_PMAC_COUNT 2
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index c2701ccd0a1d..c231e45e7070 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -44,10 +44,10 @@ struct be_mcc_wrb {
44 } payload; 44 } payload;
45}; 45};
46 46
47#define CQE_FLAGS_VALID_MASK (1 << 31) 47#define CQE_FLAGS_VALID_MASK BIT(31)
48#define CQE_FLAGS_ASYNC_MASK (1 << 30) 48#define CQE_FLAGS_ASYNC_MASK BIT(30)
49#define CQE_FLAGS_COMPLETED_MASK (1 << 28) 49#define CQE_FLAGS_COMPLETED_MASK BIT(28)
50#define CQE_FLAGS_CONSUMED_MASK (1 << 27) 50#define CQE_FLAGS_CONSUMED_MASK BIT(27)
51 51
52/* Completion Status */ 52/* Completion Status */
53enum mcc_base_status { 53enum mcc_base_status {
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index 8e91ae851a7c..a8593aa46359 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -75,7 +75,7 @@
75 * atomically without having to arbitrate for the PCI Interrupt Disable bit 75 * atomically without having to arbitrate for the PCI Interrupt Disable bit
76 * with the OS. 76 * with the OS.
77 */ 77 */
78#define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ 78#define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK BIT(29) /* bit 29 */
79 79
80/********* PCI Function Capability *********/ 80/********* PCI Function Capability *********/
81#define BE_FUNCTION_CAPS_RSS 0x2 81#define BE_FUNCTION_CAPS_RSS 0x2
@@ -224,7 +224,7 @@ struct amap_eth_hdr_wrb {
224} __packed; 224} __packed;
225 225
226#define TX_HDR_WRB_COMPL 1 /* word 2 */ 226#define TX_HDR_WRB_COMPL 1 /* word 2 */
227#define TX_HDR_WRB_EVT (1 << 1) /* word 2 */ 227#define TX_HDR_WRB_EVT BIT(1) /* word 2 */
228#define TX_HDR_WRB_NUM_SHIFT 13 /* word 2: bits 13:17 */ 228#define TX_HDR_WRB_NUM_SHIFT 13 /* word 2: bits 13:17 */
229#define TX_HDR_WRB_NUM_MASK 0x1F /* word 2: bits 13:17 */ 229#define TX_HDR_WRB_NUM_MASK 0x1F /* word 2: bits 13:17 */
230 230