Home » Mailing list archives » git-commits-head » 2009 » May » 3

[SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl

Previous thread: [SCSI] mpt2sas : running out of message frames by Linux Kernel Mailing List on Saturday, May 2, 2009 - 5:02 pm. (1 message)

Next thread: [SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time by Linux Kernel Mailing List on Saturday, May 2, 2009 - 5:02 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: [SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
Date: Saturday, May 2, 2009 - 5:02 pm

Gitweb:     http://git.kernel.org/linus/e5f9bb198aa47d06553b66cc5f24ded49ed0b70d
Commit:     e5f9bb198aa47d06553b66cc5f24ded49ed0b70d
Parent:     77bdd9ee1e1d94fa853c354dcde881ddc5d277a5
Author:     Eric Moore <eric.moore@lsi.com>
AuthorDate: Tue Apr 21 15:40:01 2009 -0600
Committer:  James Bottomley <James.Bottomley@HansenPartnership.com>
CommitDate: Mon Apr 27 10:53:58 2009 -0500

    [SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
    
    The driver name needs to be at the beginining of the driver_version string in
    MPT2IOCINFO ioctl.  This is the same behaviour is there already in the mptsas
    driver.
    
    Signed-off-by: Eric Moore <eric.moore@lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
 drivers/scsi/mpt2sas/mpt2sas_ctl.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index e0eab0a..2dc3859 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -917,9 +917,9 @@ _ctl_getiocinfo(void __user *arg)
 	karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn);
 	karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus);
 	karg.firmware_version = ioc->facts.FWVersion.Word;
-	strncpy(karg.driver_version, MPT2SAS_DRIVER_VERSION,
-	    MPT2_IOCTL_VERSION_LENGTH);
-	karg.driver_version[MPT2_IOCTL_VERSION_LENGTH - 1] = '\0';
+	strcpy(karg.driver_version, MPT2SAS_DRIVER_NAME);
+	strcat(karg.driver_version, "-");
+	strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION);
 	karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion);
 
 	if (copy_to_user(arg, &karg, sizeof(karg))) {
--


[ message continues ]
Previous thread: [SCSI] mpt2sas : running out of message frames by Linux Kernel Mailing List on Saturday, May 2, 2009 - 5:02 pm. (1 message)

Next thread: [SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time by Linux Kernel Mailing List on Saturday, May 2, 2009 - 5:02 pm. (1 message)