Merge tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[karo-tx-linux.git] / drivers / scsi / cxgbi / libcxgbi.c

diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index f4cfa1eda9e447d2ea53872917f1332d0763d50d..f3bb7af4e984ed50471aa75de673c4287d297503 100644 (file)
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -38,8 +38,12 @@ static unsigned int dbg_level;
 
 #define DRV_MODULE_NAME                "libcxgbi"
 #define DRV_MODULE_DESC                "Chelsio iSCSI driver library"
-#define DRV_MODULE_VERSION     "0.9.0"
-#define DRV_MODULE_RELDATE     "Jun. 2010"
+#define DRV_MODULE_VERSION     "0.9.1-ko"
+#define DRV_MODULE_RELDATE     "Apr. 2015"
+
+static char version[] =
+       DRV_MODULE_DESC " " DRV_MODULE_NAME
+       " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Chelsio Communications, Inc.");
 MODULE_DESCRIPTION(DRV_MODULE_DESC);
@@ -728,7 +732,7 @@ static struct cxgbi_sock *cxgbi_check_route6(struct sockaddr *dst_addr)
        }
        ndev = n->dev;
 
-       if (ipv6_addr_is_multicast(&rt->rt6i_dst.addr)) {
+       if (ipv6_addr_is_multicast(&daddr6->sin6_addr)) {
                pr_info("multi-cast route %pI6 port %u, dev %s.\n",
                        daddr6->sin6_addr.s6_addr,
                        ntohs(daddr6->sin6_port), ndev->name);
@@ -2913,6 +2917,8 @@ static int __init libcxgbi_init_module(void)
        sw_tag_idx_bits = (__ilog2_u32(ISCSI_ITT_MASK)) + 1;
        sw_tag_age_bits = (__ilog2_u32(ISCSI_AGE_MASK)) + 1;
 
+       pr_info("%s", version);
+
        pr_info("tag itt 0x%x, %u bits, age 0x%x, %u bits.\n",
                ISCSI_ITT_MASK, sw_tag_idx_bits,
                ISCSI_AGE_MASK, sw_tag_age_bits);