diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2017-07-02 18:57:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-03 02:32:25 -0700 |
| commit | c1c1d86bdea45880c1843087d40498127d4293c9 (patch) | |
| tree | 56a9380a4706785318e12b1ea4e3150ca89e90cd | |
| parent | b2c9c5df6665be7f27381ce5185b830accdb10e7 (diff) | |
| download | linux-c1c1d86bdea45880c1843087d40498127d4293c9.tar.gz | |
net/mlxfw: Properly handle dependancy with non-loadable mlx5
If mlx5 is set to be built-in and mlxfw as a module, we
get a link error:
drivers/built-in.o: In function `mlx5_firmware_flash':
(.text+0x5aed72): undefined reference to `mlxfw_firmware_flash'
Since we don't want to mandate selecting mlxfw for mlx5 users, we
use the IS_REACHABLE macro to make sure that a stub is exposed
to the caller.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reported-by: Jakub Kicinski <kubakici@wp.pl>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h b/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h index 9ca85383aa35e..7a712b6b09ec1 100644 --- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h +++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h @@ -96,7 +96,7 @@ struct mlxfw_dev { u16 psid_size; }; -#if IS_ENABLED(CONFIG_MLXFW) +#if IS_REACHABLE(CONFIG_MLXFW) int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev, const struct firmware *firmware); #else |