From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net, gregkh@linuxfoundation.org
Cc: Shiraz Saleem <shiraz.saleem@intel.com>,
netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
nhorman@redhat.com, sassmann@redhat.com, jgg@ziepe.ca,
ranjani.sridharan@linux.intel.com,
pierre-louis.bossart@linux.intel.com,
Andrew Bowers <andrewx.bowers@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v4 08/12] i40e: Move client header location
Date: Wed, 20 May 2020 00:02:23 -0700 [thread overview]
Message-ID: <20200520070227.3392100-9-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200520070227.3392100-1-jeffrey.t.kirsher@intel.com>
From: Shiraz Saleem <shiraz.saleem@intel.com>
Move i40e_client.h to include/linux/net/intel/*
since its shared between i40iw and i40e.
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/infiniband/hw/i40iw/Makefile | 1 -
drivers/infiniband/hw/i40iw/i40iw.h | 2 +-
drivers/net/ethernet/intel/i40e/i40e.h | 2 +-
drivers/net/ethernet/intel/i40e/i40e_client.c | 2 +-
.../intel/i40e => include/linux/net/intel}/i40e_client.h | 0
5 files changed, 3 insertions(+), 4 deletions(-)
rename {drivers/net/ethernet/intel/i40e => include/linux/net/intel}/i40e_client.h (100%)
diff --git a/drivers/infiniband/hw/i40iw/Makefile b/drivers/infiniband/hw/i40iw/Makefile
index 8942f8229945..34da9eba8a7c 100644
--- a/drivers/infiniband/hw/i40iw/Makefile
+++ b/drivers/infiniband/hw/i40iw/Makefile
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-ccflags-y := -I $(srctree)/drivers/net/ethernet/intel/i40e
obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o
diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h
index 3c62c9327a9c..1ba7561f9cbb 100644
--- a/drivers/infiniband/hw/i40iw/i40iw.h
+++ b/drivers/infiniband/hw/i40iw/i40iw.h
@@ -45,6 +45,7 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/crc32c.h>
+#include <linux/net/intel/i40e_client.h>
#include <rdma/ib_smi.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_pack.h>
@@ -57,7 +58,6 @@
#include "i40iw_d.h"
#include "i40iw_hmc.h"
-#include <i40e_client.h>
#include "i40iw_type.h"
#include "i40iw_p.h"
#include <rdma/i40iw-abi.h>
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index e95b8da45e07..5ff0828a6f50 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -38,7 +38,7 @@
#include <net/xdp_sock.h>
#include "i40e_type.h"
#include "i40e_prototype.h"
-#include "i40e_client.h"
+#include <linux/net/intel/i40e_client.h>
#include <linux/avf/virtchnl.h>
#include "i40e_virtchnl_pf.h"
#include "i40e_txrx.h"
diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c
index e81530ca08d0..befd3018183f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_client.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -3,10 +3,10 @@
#include <linux/list.h>
#include <linux/errno.h>
+#include <linux/net/intel/i40e_client.h>
#include "i40e.h"
#include "i40e_prototype.h"
-#include "i40e_client.h"
static const char i40e_client_interface_version_str[] = I40E_CLIENT_VERSION_STR;
static struct i40e_client *registered_client;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.h b/include/linux/net/intel/i40e_client.h
similarity index 100%
rename from drivers/net/ethernet/intel/i40e/i40e_client.h
rename to include/linux/net/intel/i40e_client.h
--
2.26.2
next prev parent reply other threads:[~2020-05-20 7:02 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 7:02 [net-next v4 00/12][pull request] 100GbE Intel Wired LAN Driver Updates 2020-05-19 Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 01/12] Implementation of Virtual Bus Jeff Kirsher
2020-05-21 14:57 ` Parav Pandit
2020-05-21 17:43 ` gregkh
2020-05-21 20:10 ` Jason Gunthorpe
2020-05-20 7:02 ` [net-next v4 02/12] ice: Create and register virtual bus for RDMA Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 03/12] ice: Complete RDMA peer registration Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 04/12] ice: Support resource allocation requests Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 05/12] ice: Enable event notifications Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 06/12] ice: Allow reset operations Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 07/12] ice: Pass through communications to VF Jeff Kirsher
2020-05-20 7:02 ` Jeff Kirsher [this message]
2020-05-20 7:02 ` [net-next v4 09/12] i40e: Register a virtbus device to provide RDMA Jeff Kirsher
2020-05-20 7:02 ` [net-next v4 10/12] ASoC: SOF: Introduce descriptors for SOF client Jeff Kirsher
2020-05-20 7:20 ` Greg KH
2020-05-20 12:54 ` Jason Gunthorpe
2020-05-20 12:57 ` Jason Gunthorpe
2020-05-21 21:11 ` Ranjani Sridharan
2020-05-21 23:34 ` Jason Gunthorpe
2020-05-22 14:29 ` Pierre-Louis Bossart
2020-05-22 14:55 ` Jason Gunthorpe
2020-05-22 15:33 ` Pierre-Louis Bossart
2020-05-22 17:10 ` Jason Gunthorpe
2020-05-22 18:35 ` Pierre-Louis Bossart
2020-05-22 18:40 ` Jason Gunthorpe
2020-05-22 18:48 ` Pierre-Louis Bossart
2020-05-22 19:44 ` Jason Gunthorpe
2020-05-22 21:05 ` Pierre-Louis Bossart
2020-06-29 20:59 ` Mark Brown
2020-05-23 6:23 ` Greg KH
2020-05-23 19:41 ` Pierre-Louis Bossart
2020-05-24 6:35 ` Greg KH
2020-05-26 13:15 ` Pierre-Louis Bossart
2020-05-26 13:37 ` Takashi Iwai
2020-05-27 7:17 ` Greg KH
2020-05-27 14:05 ` Pierre-Louis Bossart
2020-06-29 20:33 ` Mark Brown
2020-06-29 22:59 ` Jason Gunthorpe
2020-06-29 23:13 ` Kirsher, Jeffrey T
2020-06-30 10:31 ` Mark Brown
2020-06-30 11:32 ` Jason Gunthorpe
2020-06-30 14:16 ` Mark Brown
2020-06-30 17:24 ` Ranjani Sridharan
2020-06-30 17:27 ` Jason Gunthorpe
2020-07-01 9:50 ` Mark Brown
2020-07-01 23:32 ` Jason Gunthorpe
2020-07-02 11:15 ` Mark Brown
2020-07-02 12:11 ` Jason Gunthorpe
2020-07-02 12:20 ` Mark Brown
2020-07-01 6:59 ` Greg KH
2020-07-02 13:43 ` Ranjani Sridharan
2020-07-06 23:02 ` Dan Williams
2020-07-07 14:16 ` Greg KH
2020-05-25 16:55 ` Jason Gunthorpe
2020-06-29 20:21 ` Mark Brown
2020-06-29 17:36 ` Mark Brown
2020-05-20 7:02 ` [net-next v4 11/12] ASoC: SOF: Create client driver for IPC test Jeff Kirsher
2020-05-20 7:22 ` Greg KH
2020-05-20 12:56 ` Jason Gunthorpe
2020-05-27 20:18 ` Ranjani Sridharan
2020-05-28 0:12 ` Jason Gunthorpe
2020-05-28 1:40 ` Ranjani Sridharan
2020-05-28 10:45 ` Greg KH
2020-06-29 20:37 ` Mark Brown
2020-05-20 7:02 ` [net-next v4 12/12] ASoC: SOF: ops: Add new op for client registration Jeff Kirsher
2020-05-20 7:23 ` Greg KH
2020-05-20 7:17 ` [net-next v4 00/12][pull request] 100GbE Intel Wired LAN Driver Updates 2020-05-19 Greg KH
2020-05-20 7:25 ` Kirsher, Jeffrey T
2020-05-20 9:08 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520070227.3392100-9-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=andrewx.bowers@intel.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=jgg@ziepe.ca \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sassmann@redhat.com \
--cc=shiraz.saleem@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).