diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-04-03 15:23:35 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-04-03 15:23:35 +0400 |
| commit | 06524515cb36cb7ebb9eeaf8b6445198ef80beb9 (patch) | |
| tree | f6debbf5e7a37b318f0a9ae99d9a528aae1096ba /uts | |
| parent | 06d25c6ad63c0120624c185d4bf7ae981a32a547 (diff) | |
| download | illumos-packaging-06524515cb36cb7ebb9eeaf8b6445198ef80beb9.tar.gz | |
Refreshed illumos-4682.patch
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/patches/illumos-4682.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/uts/debian/patches/illumos-4682.patch b/uts/debian/patches/illumos-4682.patch index 47f64fc..2fbe10f 100644 --- a/uts/debian/patches/illumos-4682.patch +++ b/uts/debian/patches/illumos-4682.patch @@ -8,11 +8,11 @@ Date: Wed Mar 12 23:15:57 2014 +0000 Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com> Approved by: Albert Lee <trisk@nexenta.com> -diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c -index 90ddbb8..1dc8a27 100644 ---- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c -+++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c -@@ -15274,6 +15274,15 @@ mptsas_tgt_alloc(mptsas_t *mpt, uint16_t devhdl, uint64_t wwid, +Index: uts/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c +=================================================================== +--- uts.orig/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c 2014-04-03 15:17:01.701688535 +0400 ++++ uts/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c 2014-04-03 15:18:57.606905977 +0400 +@@ -15270,6 +15270,15 @@ return (tmp_tgt); } @@ -28,7 +28,7 @@ index 90ddbb8..1dc8a27 100644 static mptsas_smp_t * mptsas_smp_alloc(mptsas_t *mpt, mptsas_smp_t *data) { -@@ -15283,8 +15292,14 @@ mptsas_smp_alloc(mptsas_t *mpt, mptsas_smp_t *data) +@@ -15279,8 +15288,14 @@ addr.mta_wwn = data->m_addr.mta_wwn; addr.mta_phymask = data->m_addr.mta_phymask; ret_data = refhash_lookup(mpt->m_smp_targets, &addr); @@ -44,11 +44,11 @@ index 90ddbb8..1dc8a27 100644 return (ret_data); } -diff --git a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h -index 9768c4e..96b9b11 100644 ---- a/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h -+++ b/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h -@@ -224,6 +224,10 @@ typedef struct mptsas_target { +Index: uts/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h +=================================================================== +--- uts.orig/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h 2014-04-03 15:17:01.701688545 +0400 ++++ uts/usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h 2014-04-03 15:18:57.620587578 +0400 +@@ -224,6 +224,10 @@ } mptsas_target_t; |