iwlwifi: remove misconfigured pci ids from 22260 series

Two of the PCI ID entries for the 22260 series were incorrectly using
the subsystem vendor ID (which we ignore) as the PCI device ID.  This is
obviously wrong and can be simply removed since we already have the
correct entries in the list.

Signed-off-by: Ihab Zhaika <ihab.zhaika@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index d7b866e0e7aeaa0327ea88d842e2a5dc1a92cb44..0329b626ada64dff4a73f73522b206978f2fd341 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -959,12 +959,9 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
        {IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},
        {IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},
        {IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},
+       {IWL_PCI_DEVICE(0x2723, 0x2080, iwl22260_2ax_cfg)},
        {IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},
        {IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},
-
-       {IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},
-       {IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},
-
        {IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
        {IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
        {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax210_2ax_cfg_so_hr_a0)},