diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-19 15:18:49 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-19 15:18:49 -0800 |
| commit | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (patch) | |
| tree | f11300763594c54826e7d2990071e7818c5e8efb /drivers/infiniband | |
| parent | 9392fa06411cf93885c4cafc8058085d98f52fec (diff) | |
| download | linux-27cdef637c25705b433d5c4deeef4cf8dcb75d6a.tar.gz linux-27cdef637c25705b433d5c4deeef4cf8dcb75d6a.tar.bz2 linux-27cdef637c25705b433d5c4deeef4cf8dcb75d6a.zip | |
IB/mlx4: Use IS_ENABLED(CONFIG_IPV6)
...instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index a776aabab44a..bf218d9ec089 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -1430,7 +1430,7 @@ static int mlx4_ib_inet_event(struct notifier_block *this, unsigned long event, return NOTIFY_DONE; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) static int mlx4_ib_inet6_event(struct notifier_block *this, unsigned long event, void *ptr) { @@ -1450,7 +1450,7 @@ static void mlx4_ib_get_dev_addr(struct net_device *dev, struct mlx4_ib_dev *ibdev, u8 port) { struct in_device *in_dev; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) struct inet6_dev *in6_dev; union ib_gid *pgid; struct inet6_ifaddr *ifp; @@ -1473,7 +1473,7 @@ static void mlx4_ib_get_dev_addr(struct net_device *dev, endfor_ifa(in_dev); in_dev_put(in_dev); } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) /* IPv6 gids */ in6_dev = in6_dev_get(dev); if (in6_dev) { @@ -1874,7 +1874,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) goto err_notif; } } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) if (!iboe->nb_inet6.notifier_call) { iboe->nb_inet6.notifier_call = mlx4_ib_inet6_event; err = register_inet6addr_notifier(&iboe->nb_inet6); @@ -1921,7 +1921,7 @@ err_notif: pr_warn("failure unregistering notifier\n"); ibdev->iboe.nb_inet.notifier_call = NULL; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) if (ibdev->iboe.nb_inet6.notifier_call) { if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6)) pr_warn("failure unregistering notifier\n"); @@ -1976,7 +1976,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) pr_warn("failure unregistering notifier\n"); ibdev->iboe.nb_inet.notifier_call = NULL; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6) if (ibdev->iboe.nb_inet6.notifier_call) { if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6)) pr_warn("failure unregistering notifier\n"); |