diff options
| author | Anish Bhatt <anish@chelsio.com> | 2014-07-18 05:34:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-20 11:45:54 +0400 |
| commit | e81fbf6cd65247e6c65719eacf2af5856db3d5a9 (patch) | |
| tree | fdecabe7d037198eaaa77e97d3200a9967592d8b /drivers/scsi/cxgbi/cxgb4i | |
| parent | da388973d4a15e71cada1219d625b5393c90e5ae (diff) | |
| download | linux-e81fbf6cd65247e6c65719eacf2af5856db3d5a9.tar.xz | |
libcxgbi:cxgb4i Guard ipv6 code with a config check
Fixes: fc8d0590d914 ("libcxgbi: Add ipv6 api to driver")
Fixes: 759a0cc5a3e1 ("cxgb4i: Add ipv6 code to driver, call into libcxgbi ipv6
api")
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/cxgbi/cxgb4i')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index 1041574edcfc..a4a4e98effdd 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c @@ -1289,8 +1289,14 @@ static int init_act_open(struct cxgbi_sock *csk) if (csk->csk_family == AF_INET) daddr = &csk->daddr.sin_addr.s_addr; - else +#if IS_ENABLED(CONFIG_IPV6) + else if (csk->csk_family == AF_INET6) daddr = &csk->daddr6.sin6_addr; +#endif + else { + pr_err("address family 0x%x not supported\n", csk->csk_family); + goto rel_resource; + } n = dst_neigh_lookup(csk->dst, daddr); @@ -1631,6 +1637,7 @@ static int cxgb4i_ddp_init(struct cxgbi_device *cdev) return 0; } +#if IS_ENABLED(CONFIG_IPV6) static int cxgbi_inet6addr_handler(struct notifier_block *this, unsigned long event, void *data) { @@ -1755,6 +1762,7 @@ static void cxgbi_update_clip(struct cxgbi_device *cdev) } rcu_read_unlock(); } +#endif /* IS_ENABLED(CONFIG_IPV6) */ static void *t4_uld_add(const struct cxgb4_lld_info *lldi) { @@ -1874,7 +1882,9 @@ static int t4_uld_state_change(void *handle, enum cxgb4_state state) switch (state) { case CXGB4_STATE_UP: pr_info("cdev 0x%p, UP.\n", cdev); +#if IS_ENABLED(CONFIG_IPV6) cxgbi_update_clip(cdev); +#endif /* re-initialize */ break; case CXGB4_STATE_START_RECOVERY: @@ -1906,15 +1916,17 @@ static int __init cxgb4i_init_module(void) return rc; cxgb4_register_uld(CXGB4_ULD_ISCSI, &cxgb4i_uld_info); +#if IS_ENABLED(CONFIG_IPV6) register_inet6addr_notifier(&cxgbi_inet6addr_notifier); - +#endif return 0; } static void __exit cxgb4i_exit_module(void) { +#if IS_ENABLED(CONFIG_IPV6) unregister_inet6addr_notifier(&cxgbi_inet6addr_notifier); - +#endif cxgb4_unregister_uld(CXGB4_ULD_ISCSI); cxgbi_device_unregister_all(CXGBI_FLAG_DEV_T4); cxgbi_iscsi_cleanup(&cxgb4i_iscsi_transport, &cxgb4i_stt); |