Commit 5ebcb0ff authored by Henry Orosco's avatar Henry Orosco Committed by Doug Ledford

i40iw: Use runtime check for IS_ENABLED(CONFIG_IPV6)

To be consistent, use the runtime check instead of
conditional compile.
Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarHenry Orosco <henry.orosco@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e6779185
...@@ -1583,9 +1583,10 @@ static enum i40iw_status_code i40iw_del_multiple_qhash( ...@@ -1583,9 +1583,10 @@ static enum i40iw_status_code i40iw_del_multiple_qhash(
static struct net_device *i40iw_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac) static struct net_device *i40iw_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac)
{ {
struct net_device *ip_dev = NULL; struct net_device *ip_dev = NULL;
#if IS_ENABLED(CONFIG_IPV6)
struct in6_addr laddr6; struct in6_addr laddr6;
if (!IS_ENABLED(CONFIG_IPV6))
return NULL;
i40iw_copy_ip_htonl(laddr6.in6_u.u6_addr32, addr); i40iw_copy_ip_htonl(laddr6.in6_u.u6_addr32, addr);
if (vlan_id) if (vlan_id)
*vlan_id = I40IW_NO_VLAN; *vlan_id = I40IW_NO_VLAN;
...@@ -1602,7 +1603,6 @@ static struct net_device *i40iw_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *ma ...@@ -1602,7 +1603,6 @@ static struct net_device *i40iw_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *ma
} }
} }
rcu_read_unlock(); rcu_read_unlock();
#endif
return ip_dev; return ip_dev;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment