commit 866447e402d4583129ff21ddc621c7a4993ce869
author Wei-Ning Huang <wnhuang@chromium.org> Sat Jul 02 15:57:01 2016 +0800
committer chrome-bot <chrome-bot@chromium.org> Wed Jul 06 01:04:47 2016 -0700
tree 4a15a3e028ebc155a3af5bce5c1345f0cdcc63c0
parent b91faa5611e549c6bbcc6797317361c72826ebec

network_WlanDriver: add support for Marvell 8997 on kernel 4.4

Kevin uses Marvell 8W8997 via PCIE interface.

BUG=chrome-os-partner:52323
TEST=`test_that -b kevin dut network_WlanDriver`

Change-Id: Iea382487e560dca6bf1438cf575f4c6e0e07cf14
Reviewed-on: https://chromium-review.googlesource.com/358280
Commit-Ready: Wei-Ning Huang <wnhuang@chromium.org>
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>
Reviewed-by: Mao Huang <littlecvr@chromium.org>

client/common_lib/cros/network/interface.py

diff --git a/client/common_lib/cros/network/interface.py b/client/common_lib/cros/network/interface.py
index c30007c..a456d97 100644
--- a/client/common_lib/cros/network/interface.py
+++ b/client/common_lib/cros/network/interface.py
@@ -27,6 +27,7 @@
 NAME_MARVELL_88W8887_SDIO = 'Marvell 88W8887 SDIO'
 NAME_MARVELL_88W8897_SDIO = 'Marvell 88W8897 SDIO'
 NAME_MARVELL_88W8897_PCIE = 'Marvell 88W8897 PCIE'
+NAME_MARVELL_88W8997_PCIE = 'Marvell 88W8997 PCIE'
 NAME_ATHEROS_AR9280 = 'Atheros AR9280'
 NAME_ATHEROS_AR9382 = 'Atheros AR9382'
 NAME_ATHEROS_AR9462 = 'Atheros AR9462'
@@ -44,6 +45,7 @@
     DeviceInfo('0x02df', '0x912d'): NAME_MARVELL_88W8897_SDIO,
     DeviceInfo('0x02df', '0x9135'): NAME_MARVELL_88W8887_SDIO,
     DeviceInfo('0x11ab', '0x2b38'): NAME_MARVELL_88W8897_PCIE,
+    DeviceInfo('0x1b4b', '0x2b42'): NAME_MARVELL_88W8997_PCIE,
     DeviceInfo('0x168c', '0x002a'): NAME_ATHEROS_AR9280,
     DeviceInfo('0x168c', '0x0030'): NAME_ATHEROS_AR9382,
     DeviceInfo('0x168c', '0x0034'): NAME_ATHEROS_AR9462,

client/site_tests/network_WlanDriver/network_WlanDriver.py

diff --git a/client/site_tests/network_WlanDriver/network_WlanDriver.py b/client/site_tests/network_WlanDriver/network_WlanDriver.py
index b69fffb..6b453e5 100755
--- a/client/site_tests/network_WlanDriver/network_WlanDriver.py
+++ b/client/site_tests/network_WlanDriver/network_WlanDriver.py
@@ -64,6 +64,9 @@
             'Broadcom BCM4356 PCIE': {
                      '3.10': 'wireless-3.8/brcm80211/brcmfmac/brcmfmac.ko'
             },
+            'Marvell 88W8997 PCIE': {
+                     '4.4': 'wireless/marvell/mwifiex/mwifiex_pcie.ko',
+            },
     }