renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

IB/mlx4: Use IS_ENABLED(CONFIG_IPV6)

Browse Source 
...instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Roland Dreier 2014-01-19 15:18:49 -08:00
parent 9392fa0641
commit 27cdef637c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/infiniband/hw/mlx4/main.c
View File

@ -1430,7 +1430,7 @@ static int mlx4_ib_inet_event(struct notifier_block *this, unsigned long event,
return NOTIFY_DONE; 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, static int mlx4_ib_inet6_event(struct notifier_block *this, unsigned long event,
void *ptr) 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 mlx4_ib_dev *ibdev, u8 port)
{ {
struct in_device *in_dev; struct in_device *in_dev;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if IS_ENABLED(CONFIG_IPV6)
struct inet6_dev *in6_dev; struct inet6_dev *in6_dev;
union ib_gid *pgid; union ib_gid *pgid;
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
@ -1473,7 +1473,7 @@ static void mlx4_ib_get_dev_addr(struct net_device *dev,
endfor_ifa(in_dev); endfor_ifa(in_dev);
in_dev_put(in_dev); in_dev_put(in_dev);
} }
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if IS_ENABLED(CONFIG_IPV6)
/* IPv6 gids */ /* IPv6 gids */
in6_dev = in6_dev_get(dev); in6_dev = in6_dev_get(dev);
if (in6_dev) { if (in6_dev) {
@ -1874,7 +1874,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
goto err_notif; goto err_notif;
} }
} }
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if IS_ENABLED(CONFIG_IPV6)
if (!iboe->nb_inet6.notifier_call) { if (!iboe->nb_inet6.notifier_call) {
iboe->nb_inet6.notifier_call = mlx4_ib_inet6_event; iboe->nb_inet6.notifier_call = mlx4_ib_inet6_event;
err = register_inet6addr_notifier(&iboe->nb_inet6); err = register_inet6addr_notifier(&iboe->nb_inet6);
@ -1921,7 +1921,7 @@ err_notif:
pr_warn("failure unregistering notifier\n"); pr_warn("failure unregistering notifier\n");
ibdev->iboe.nb_inet.notifier_call = NULL; 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 (ibdev->iboe.nb_inet6.notifier_call) {
if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6)) if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6))
pr_warn("failure unregistering notifier\n"); 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"); pr_warn("failure unregistering notifier\n");
ibdev->iboe.nb_inet.notifier_call = NULL; 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 (ibdev->iboe.nb_inet6.notifier_call) {
if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6)) if (unregister_inet6addr_notifier(&ibdev->iboe.nb_inet6))
pr_warn("failure unregistering notifier\n"); pr_warn("failure unregistering notifier\n");