Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc3.git2.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc3.git2.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc3.git2.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc3.git2.1.vanilla.knurd.1.fc24

29 files changed, 80 insertions, 84 deletions

diff --git a/baseconfig/CONFIG_SND_X86 b/baseconfig/CONFIG_SND_X86
deleted file mode 100644
index 0c9c5435e..000000000
--- a/baseconfig/CONFIG_SND_X86
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_X86=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
index 163365765..f2dd7ea1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
@@ -1 +1 @@
-CONFIG_TI_CPTS=m
+CONFIG_TI_CPTS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
new file mode 100644
index 000000000..b81356e32
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
@@ -0,0 +1 @@
+CONFIG_TI_CPTS_MOD=m
diff --git a/baseconfig/x86/CONFIG_SND_X86 b/baseconfig/x86/CONFIG_SND_X86
new file mode 100644
index 000000000..310c61afc
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_X86
@@ -0,0 +1 @@
+CONFIG_SND_X86=y
diff --git a/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch b/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
deleted file mode 100644
index ab048d1c9..000000000
--- a/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: 2017-03-22 15:08:33
-Subject: [PATCH 4.11] genetlink: fix counting regression on ctrl_dumpfamily()
-
-Commit 2ae0f17df1cd ("genetlink: use idr to track families") replaced
-
-	if (++n < fams_to_skip)
-		continue;
-into:
-
-	if (n++ < fams_to_skip)
-		continue;
-
-This subtle change cause that on retry ctrl_dumpfamily() call we omit
-one family that failed to do ctrl_fill_info() on previous call, because
-cb->args[0] = n number counts also family that failed to do
-ctrl_fill_info().
-
-Patch fixes the problem and avoid confusion in the future just decrease
-n counter when ctrl_fill_info() fail.
-
-User visible problem caused by this bug is failure to get access to
-some genetlink family i.e. nl80211. However problem is reproducible
-only if number of registered genetlink families is big enough to
-cause second call of ctrl_dumpfamily().
-
-Cc: Xose Vazquez Perez <xose.vazquez@gmail.com>
-Cc: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: Johannes Berg <johannes@sipsolutions.net>
-Fixes: 2ae0f17df1cd ("genetlink: use idr to track families")
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
----
-Dave, please also target this for 4.10+ -stable.
-
- net/netlink/genetlink.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
-index fb6e10f..92e0981 100644
---- a/net/netlink/genetlink.c
-+++ b/net/netlink/genetlink.c
-@@ -783,8 +783,10 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
- 
- 		if (ctrl_fill_info(rt, NETLINK_CB(cb->skb).portid,
- 				   cb->nlh->nlmsg_seq, NLM_F_MULTI,
--				   skb, CTRL_CMD_NEWFAMILY) < 0)
-+				   skb, CTRL_CMD_NEWFAMILY) < 0) {
-+			n--;
- 			break;
-+		}
- 	}
- 
- 	cb->args[0] = n;
--- 
-1.7.1
diff --git a/gitrev b/gitrev
index 6230bcf0d..defc91fb9 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-093b995e3b55a0ae0670226ddfcb05bfbf0099ae
+ebe64824e9de4b3ab3bd3928312b4b2bc57b4b7e
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a369f5bc2..4af6156dd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5159,7 +5159,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 10158f03d..5979e0ea9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5136,7 +5136,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index a8e7b30d3..2acd96043 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5644,7 +5644,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
@@ -5964,7 +5963,8 @@ CONFIG_TI_CPPI41=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TI_CPSW=m
 CONFIG_TI_CPSW_PHY_SEL=y
-CONFIG_TI_CPTS=m
+CONFIG_TI_CPTS_MOD=m
+CONFIG_TI_CPTS=y
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_DAVINCI_EMAC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5732365d5..7115ec258 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5307,7 +5307,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 427e6c121..ff6a9b4d7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5284,7 +5284,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d59cb1746..7215da28e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5621,7 +5621,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
@@ -5941,7 +5940,8 @@ CONFIG_TI_CPPI41=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TI_CPSW=m
 CONFIG_TI_CPSW_PHY_SEL=y
-CONFIG_TI_CPTS=m
+CONFIG_TI_CPTS_MOD=m
+CONFIG_TI_CPTS=y
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_DAVINCI_EMAC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 20921a84f..a4de0f1c0 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4921,7 +4921,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 4ee9e062a..128e7035c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4943,7 +4943,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 0461895f9..094d8e01a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4943,7 +4943,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 071c9d0b1..329784839 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4921,7 +4921,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3a169b672..5fb547750 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4769,7 +4769,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 83ae60565..e3bd6be9b 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4745,7 +4745,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 91ddfc3c2..54fa3528f 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4698,7 +4698,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 0d32e092d..7ca9997a5 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4674,7 +4674,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index d86032f89..1e8f8148c 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4697,7 +4697,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index eddc66132..c1376535f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4673,7 +4673,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 50df5a9cd..bfddb869a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4595,7 +4595,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 9fb8cd500..c10c59afd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4571,7 +4571,6 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2fcb8a3c2..a458b1634 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4972,7 +4972,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f0a76f829..a1225d4fa 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4950,7 +4950,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_X86=m
+CONFIG_SND_X86=y
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_TI is not set
diff --git a/kernel.spec b/kernel.spec
index 28bffaa93..0533758c1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -622,8 +622,8 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 # grabbed from mailing list
 Patch667: v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch
 
-# Fix crda rhbz 1422247
-Patch668: genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch
+# Fix virtio devices rhbz 1430297
+Patch669: virtio_pci-fix-out-of-bound-access-for-msix_names.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2192,6 +2192,12 @@ fi
 #
 #
 %changelog
+* Fri Mar 24 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc3.git2.1
+- Linux v4.11-rc3-161-gebe6482
+
+* Thu Mar 23 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix virtio devices (rhbz 1430297)
+
 * Wed Mar 22 2017 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix crda (rhbz 1422247)
 
diff --git a/sources b/sources
index 8cbdf9580..9a0be4cf5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
 SHA512 (patch-4.11-rc3.xz) = 88ff442fdcc41cd3734ddabc3cee54ea15ff5fef6b3bc1edc8f8c904ac888b45942a483ae35e3fee1a3b050d925755501b53de2e241a98905f63bb763a389086
-SHA512 (patch-4.11-rc3-git1.xz) = 2021cf4ea7f7f16b6520230bde793f00d105d1eff0b828f3c34634b52c6940c342c11dc49ebedf99404962f01c8b6be98da1c415a17e3de716f07c05c457582b
+SHA512 (patch-4.11-rc3-git2.xz) = 67b5ce2c19c6c5723bc30444d7fc5f50cc42839bbd678822453365252317523cf4a396bed30f712cd58a601697f34aaf6c31326e546e55fe908d7f44e808f1d0
diff --git a/virtio_pci-fix-out-of-bound-access-for-msix_names.patch b/virtio_pci-fix-out-of-bound-access-for-msix_names.patch
new file mode 100644
index 000000000..d87676674
--- /dev/null
+++ b/virtio_pci-fix-out-of-bound-access-for-msix_names.patch
@@ -0,0 +1,56 @@
+From: Jason Wang <jasowang@redhat.com>
+Date: Thu, 23 Mar 2017 13:07:16 +0800
+Subject: [PATCH] virtio_pci: fix out of bound access for msix_names
+
+---
+ drivers/virtio/virtio_pci_common.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
+index df548a6..5905349 100644
+--- a/drivers/virtio/virtio_pci_common.c
++++ b/drivers/virtio/virtio_pci_common.c
+@@ -147,7 +147,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,
+ {
+ 	struct virtio_pci_device *vp_dev = to_vp_device(vdev);
+ 	const char *name = dev_name(&vp_dev->vdev.dev);
+-	int i, err = -ENOMEM, allocated_vectors, nvectors;
++	int i, j, err = -ENOMEM, allocated_vectors, nvectors;
+ 	unsigned flags = PCI_IRQ_MSIX;
+ 	bool shared = false;
+ 	u16 msix_vec;
+@@ -212,7 +212,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,
+ 	if (!vp_dev->msix_vector_map)
+ 		goto out_disable_config_irq;
+ 
+-	allocated_vectors = 1; /* vector 0 is the config interrupt */
++	allocated_vectors = j = 1; /* vector 0 is the config interrupt */
+ 	for (i = 0; i < nvqs; ++i) {
+ 		if (!names[i]) {
+ 			vqs[i] = NULL;
+@@ -236,18 +236,19 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,
+ 			continue;
+ 		}
+ 
+-		snprintf(vp_dev->msix_names[i + 1],
++		snprintf(vp_dev->msix_names[j],
+ 			 sizeof(*vp_dev->msix_names), "%s-%s",
+ 			 dev_name(&vp_dev->vdev.dev), names[i]);
+ 		err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec),
+ 				  vring_interrupt, IRQF_SHARED,
+-				  vp_dev->msix_names[i + 1], vqs[i]);
++				  vp_dev->msix_names[j], vqs[i]);
+ 		if (err) {
+ 			/* don't free this irq on error */
+ 			vp_dev->msix_vector_map[i] = VIRTIO_MSI_NO_VECTOR;
+ 			goto out_remove_vqs;
+ 		}
+ 		vp_dev->msix_vector_map[i] = msix_vec;
++		j++;
+ 
+ 		/*
+ 		 * Use a different vector for each queue if they are available,
+-- 
+2.7.4
+
+