RDMA/ocrdma: Fixed CONFIG_VLAN_8021Q.

From: Roland Dreier <roland@purestorage.com>

On Fri, Aug 10, 2012 at 9:28 AM, Parav Pandit <parav.pandit@emulex.com> wrote:
> Fixed avoiding checking real vlan dev in scenario
> when VLAN is disabled and ipv6 is enabled.

It would be a nice touch to acknowledge Fengguang with a Reported-by:

> Signed-off-by: Parav Pandit <parav.pandit@emulex.com>
> ---
>  drivers/infiniband/hw/ocrdma/ocrdma_main.c |   16 ++++++++++++----
>  1 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> index 5a04452..7146ffd 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
> @@ -161,7 +161,7 @@ static void ocrdma_add_default_sgid(struct ocrdma_dev *dev)
>         ocrdma_get_guid(dev, &sgid->raw[8]);
>  }
>
> -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
> +#if IS_ENABLED(CONFIG_VLAN_8021Q) || IS_ENABLED(CONFIG_VLAN_8021Q_MODULE)

a single IS_ENABLED() tests both CONFIG_xxx and CONFIG_xxx_MODULE

>  static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
>  {
>         struct net_device *netdev, *tmp;
> @@ -202,8 +202,16 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
>         return 0;
>  }
>
> -#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_VLAN_8021Q)
> +static struct net_device *ocrdma_get_real_netdev(struct net_device *netdev)
> +{
> +#if IS_ENABLED(CONFIG_VLAN_8021Q) || IS_ENABLED(CONFIG_VLAN_8021Q_MODULE)
> +       return vlan_dev_real_dev(netdev);
> +#else
> +       return netdev;
> +#endif
> +}

This is kind of crazy: it's a big helper that you only use in one
spot, and the whole point of IS_ENABLED() is that it is usable in C
code too -- so you could at least write this without using the
preprocessor.  But I don't think it really helps to split out this
wrapper.

> +#if IS_ENABLED(CONFIG_IPV6)
>  static int ocrdma_inet6addr_event(struct notifier_block *notifier,
>                                   unsigned long event, void *ptr)
>  {
> @@ -217,7 +225,7 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
>         bool is_vlan = false;
>         u16 vid = 0;
>
> -       netdev = vlan_dev_real_dev(event_netdev);
> +       netdev = ocrdma_get_real_netdev(event_netdev);
>         if (netdev != event_netdev) {
>                 is_vlan = true;
>                 vid = vlan_dev_vlan_id(event_netdev);
> @@ -262,7 +270,7 @@ static struct notifier_block ocrdma_inet6addr_notifier = {
>         .notifier_call = ocrdma_inet6addr_event
>  };
>
> -#endif /* IPV6 and VLAN */
> +#endif /* IPV6 */
>
>  static enum rdma_link_layer ocrdma_link_layer(struct ib_device *device,
>                                               u8 port_num)

How about this simpler version:

From d549f55f2e132e3d1f1288ce4231f45f12988bbf Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Fri, 10 Aug 2012 16:52:13 -0700
Subject: [PATCH] RDMA/ocrdma: Don't call vlan_dev_real_dev() for non-VLAN
 netdevs

If CONFIG_VLAN_8021Q is not set, then vlan_dev_real_dev() just goes BUG(),
so we shouldn't call it unless we're actually dealing with a VLAN netdev.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

 		if (dev->nic_info.netdev == netdev) {

RDMA/ocrdma: Fixed CONFIG_VLAN_8021Q.

Commit Message

Patch