diff options
| author | hselasky <hselasky@FreeBSD.org> | 2015-01-19 21:53:00 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2015-01-19 21:53:00 +0000 |
| commit | 551300d1123f7cc0163b0a449f3add8ca22e12c3 (patch) | |
| tree | 4a2ba752ee9bdeb68ad9ee9ab2ed91a0f01bd70b /sys/ofed/drivers/infiniband | |
| parent | b4271ae0c2b4c61c103639b9ec43de48e3b32d7c (diff) | |
| download | FreeBSD-src-551300d1123f7cc0163b0a449f3add8ca22e12c3.zip FreeBSD-src-551300d1123f7cc0163b0a449f3add8ca22e12c3.tar.gz | |
Add missing linuxapi module dependencies and always use the FreeBSD
"MODULE_VERSION" macro definition. Remove the redefinition of the
"MODULE_VERSION" macro from the Linux kernel compatibility API.
MFC after: 1 month
Reported by: np@
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/ofed/drivers/infiniband')
| -rw-r--r-- | sys/ofed/drivers/infiniband/core/device.c | 2 | ||||
| -rw-r--r-- | sys/ofed/drivers/infiniband/hw/mlx4/main.c | 4 | ||||
| -rw-r--r-- | sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c | 4 | ||||
| -rw-r--r-- | sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sys/ofed/drivers/infiniband/core/device.c b/sys/ofed/drivers/infiniband/core/device.c index e2e6baf..98adf48 100644 --- a/sys/ofed/drivers/infiniband/core/device.c +++ b/sys/ofed/drivers/infiniband/core/device.c @@ -754,8 +754,6 @@ static void __exit ib_core_cleanup(void) module_init(ib_core_init); module_exit(ib_core_cleanup); -#undef MODULE_VERSION -#include <sys/module.h> static int ibcore_evhand(module_t mod, int event, void *arg) { diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/main.c b/sys/ofed/drivers/infiniband/hw/mlx4/main.c index 441ee73..fd0b723 100644 --- a/sys/ofed/drivers/infiniband/hw/mlx4/main.c +++ b/sys/ofed/drivers/infiniband/hw/mlx4/main.c @@ -67,7 +67,9 @@ MODULE_AUTHOR("Roland Dreier"); MODULE_DESCRIPTION("Mellanox ConnectX HCA InfiniBand driver"); MODULE_LICENSE("Dual BSD/GPL"); +#ifdef __linux__ MODULE_VERSION(DRV_VERSION); +#endif int mlx4_ib_sm_guid_assign = 1; @@ -2404,8 +2406,6 @@ static void __exit mlx4_ib_cleanup(void) module_init_order(mlx4_ib_init, SI_ORDER_MIDDLE); module_exit(mlx4_ib_cleanup); -#undef MODULE_VERSION -#include <sys/module.h> static int mlx4ib_evhand(module_t mod, int event, void *arg) { diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c index d1da694..8596bdd 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c @@ -47,7 +47,9 @@ MODULE_AUTHOR("Roland Dreier"); MODULE_DESCRIPTION("Mellanox InfiniBand HCA low-level driver"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_VERSION(DRV_VERSION); +MODULE_VERSION(mthca, 1); +MODULE_DEPEND(mthca, linuxapi, 1, 1, 1); +MODULE_DEPEND(mthca, ibcore, 1, 1, 1); #ifdef CONFIG_INFINIBAND_MTHCA_DEBUG diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c index fe51738..695621f 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -1527,8 +1527,6 @@ ipoib_resolvemulti(struct ifnet *ifp, struct sockaddr **llsa, module_init(ipoib_init_module); module_exit(ipoib_cleanup_module); -#undef MODULE_VERSION -#include <sys/module.h> static int ipoib_evhand(module_t mod, int event, void *arg) { |
