diff options
| author | Allen Hubbe <Allen.Hubbe@emc.com> | 2015-05-07 10:45:21 (GMT) |
|---|---|---|
| committer | Allen Hubbe <Allen.Hubbe@emc.com> | 2015-07-02 14:09:23 (GMT) |
| commit | ec110bc7cc48d7806c9b65094e6afb19452d458f (patch) | |
| tree | aa46f83b5d7c7d104902aedd333c0f4f02817b29 /drivers/net | |
| parent | d8133356e99713bd023b229de107ddd6dd6d375a (diff) | |
| download | linux-ec110bc7cc48d7806c9b65094e6afb19452d458f.tar.xz | |
NTB: Move files in preparation for NTB abstraction
This patch only moves files to their new locations, before applying the
next two patches adding the NTB Abstraction layer. Splitting this patch
from the next is intended make distinct which code is changed only due
to moving the files, versus which are substantial code changes in adding
the NTB Abstraction layer.
Signed-off-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/ntb_netdev.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index df51d60..bda3cde 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -203,8 +203,8 @@ config NET_POLL_CONTROLLER def_bool NETPOLL config NTB_NETDEV - tristate "Virtual Ethernet over NTB" - depends on NTB + tristate "Virtual Ethernet over NTB Transport" + depends on NTB_TRANSPORT config RIONET tristate "RapidIO Ethernet over messaging driver support" diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index 5a7e639..6d3bfa6 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c @@ -49,7 +49,7 @@ #include <linux/ethtool.h> #include <linux/module.h> #include <linux/pci.h> -#include <linux/ntb.h> +#include <linux/ntb_transport.h> #define NTB_NETDEV_VER "0.7" @@ -410,13 +410,13 @@ static int __init ntb_netdev_init_module(void) rc = ntb_register_client_dev(KBUILD_MODNAME); if (rc) return rc; - return ntb_register_client(&ntb_netdev_client); + return ntb_transport_register_client(&ntb_netdev_client); } module_init(ntb_netdev_init_module); static void __exit ntb_netdev_exit_module(void) { - ntb_unregister_client(&ntb_netdev_client); + ntb_transport_unregister_client(&ntb_netdev_client); ntb_unregister_client_dev(KBUILD_MODNAME); } module_exit(ntb_netdev_exit_module); |