diff options
author | Dmitry Torokhov | 2017-05-02 18:48:26 +0200 |
---|---|---|
committer | Dmitry Torokhov | 2017-05-02 18:48:26 +0200 |
commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /drivers/infiniband/hw/hfi1/common.h | |
parent | Input: i8042 - add Clevo P650RS to the i8042 reset list (diff) | |
parent | Input: ar1021_i2c - use BIT to check for a bit (diff) | |
download | kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.tar.gz kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.tar.xz kernel-qcow2-linux-0337966d121ebebf73a1c346123e8112796e684e.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'drivers/infiniband/hw/hfi1/common.h')
-rw-r--r-- | drivers/infiniband/hw/hfi1/common.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/common.h b/drivers/infiniband/hw/hfi1/common.h index da7be21bedb4..1b783bbee4bb 100644 --- a/drivers/infiniband/hw/hfi1/common.h +++ b/drivers/infiniband/hw/hfi1/common.h @@ -331,10 +331,6 @@ struct diag_pkt { #define FULL_MGMT_P_KEY 0xFFFF #define DEFAULT_P_KEY LIM_MGMT_P_KEY -#define HFI1_AETH_CREDIT_SHIFT 24 -#define HFI1_AETH_CREDIT_MASK 0x1F -#define HFI1_AETH_CREDIT_INVAL 0x1F -#define HFI1_MSN_MASK 0xFFFFFF #define HFI1_FECN_SHIFT 31 #define HFI1_FECN_MASK 1 #define HFI1_FECN_SMASK BIT(HFI1_FECN_SHIFT) |