diff options
| author | Anish Bhatt <anish@chelsio.com> | 2014-07-17 18:34:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-20 00:45:54 -0700 |
| commit | e81fbf6cd65247e6c65719eacf2af5856db3d5a9 (patch) | |
| tree | fdecabe7d037198eaaa77e97d3200a9967592d8b /drivers/scsi/cxgbi/libcxgbi.c | |
| parent | da388973d4a15e71cada1219d625b5393c90e5ae (diff) | |
| download | op-kernel-dev-e81fbf6cd65247e6c65719eacf2af5856db3d5a9.zip op-kernel-dev-e81fbf6cd65247e6c65719eacf2af5856db3d5a9.tar.gz | |
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/libcxgbi.c')
| -rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index d2fe507..3d5322d 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -602,6 +602,7 @@ err_out: return ERR_PTR(err); } +#if IS_ENABLED(CONFIG_IPV6) static struct rt6_info *find_route_ipv6(const struct in6_addr *saddr, const struct in6_addr *daddr) { @@ -716,6 +717,7 @@ rel_rt: err_out: return ERR_PTR(err); } +#endif /* IS_ENABLED(CONFIG_IPV6) */ void cxgbi_sock_established(struct cxgbi_sock *csk, unsigned int snd_isn, unsigned int opt) @@ -2638,8 +2640,10 @@ struct iscsi_endpoint *cxgbi_ep_connect(struct Scsi_Host *shost, if (dst_addr->sa_family == AF_INET) { csk = cxgbi_check_route(dst_addr); +#if IS_ENABLED(CONFIG_IPV6) } else if (dst_addr->sa_family == AF_INET6) { csk = cxgbi_check_route6(dst_addr); +#endif } else { pr_info("address family 0x%x NOT supported.\n", dst_addr->sa_family); |
