diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 11:21:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 11:21:12 +1000 |
| commit | c004499acb26a578ba4902673c3ab7976cf6e5b4 (patch) | |
| tree | 2708dba462aa18c8aa986b6ba30ec9143b41201c /include | |
| parent | 60134118fdbe826f16431c8046faae623458a0b4 (diff) | |
| parent | 67cf3623e097706b0ca03bf79bf28d60c39591eb (diff) | |
Merge remote-tracking branch 'rdma/for-next'
Updates #3 for 4.12 kernel merge window
- The hfi1 15 patch set that landed late
- IPoIB get_link_ksettings which landed late because I asked for a
respin
- One late rxe change
- One -rc worthy fix that's in early
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/rdmavt_qp.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/ethtool.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h index 1d8141a88d3c..be6472e5b06b 100644 --- a/include/rdma/rdmavt_qp.h +++ b/include/rdma/rdmavt_qp.h @@ -324,6 +324,7 @@ struct rvt_qp { u8 r_state; /* opcode of last packet received */ u8 r_flags; u8 r_head_ack_queue; /* index into s_ack_queue[] */ + u8 r_adefered; /* defered ack count */ struct list_head rspwait; /* link for waiting to respond */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 5f4ea28eabe4..d179d7767f51 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1494,6 +1494,7 @@ enum ethtool_link_mode_bit_indices { #define SPEED_2500 2500 #define SPEED_5000 5000 #define SPEED_10000 10000 +#define SPEED_14000 14000 #define SPEED_20000 20000 #define SPEED_25000 25000 #define SPEED_40000 40000 |