diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-21 22:33:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-21 22:33:00 +0300 |
| commit | 52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a (patch) | |
| tree | cd451fcec89c8c4488bc031a85b0bcb189984d7f /include/linux | |
| parent | e86283071fb0eed28136adb52997888f4beb202b (diff) | |
| parent | 7003cdd6a121e7bdb8a05eb1931f9549a36ea723 (diff) | |
| download | linux-52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a.tar.xz | |
Merge branch 'qed-File-split-and-rename-towards-iWARP-support'
Michal Kalderon says:
====================
qed*: File split and rename towards iWARP support
This patch series makes a few more infrastructure changes towards adding
iWARP support. Hopefully this is the last infrastructure change
prior to the iWARP RFC.
Patch #1-3 take care of taking all the common iWARP/RoCE code out of
qed_roce.[ch] and placing it in qed_rdma.[ch]
Patch #4 renames the roce interface file as it is common for
RoCE and iWARP. This patch touches qedr as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qed/qed_rdma_if.h (renamed from include/linux/qed/qed_roce_if.h) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/qed/qed_roce_if.h b/include/linux/qed/qed_rdma_if.h index 8e70f5ee05af..ff9be01b5f53 100644 --- a/include/linux/qed/qed_roce_if.h +++ b/include/linux/qed/qed_rdma_if.h @@ -29,8 +29,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef _QED_ROCE_IF_H -#define _QED_ROCE_IF_H +#ifndef _QED_RDMA_IF_H +#define _QED_RDMA_IF_H #include <linux/types.h> #include <linux/delay.h> #include <linux/list.h> |