Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "wil6210: ignore reset errors for FW during probe"

Browse source
This commit is contained in:
qctecmdr 2019-11-28 09:55:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 75859120dd
2 changed files with 3 additions and 5 deletions
drivers/net/wireless/ath/wil6210
pcie_bus.ctxrx_edma.c

4
drivers/net/wireless/ath/wil6210/pcie_bus.c
View file

@ -536,7 +536,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
mutex_unlock(&wil->mutex);
if (rc) {
wil_err(wil, "failed to load WMI only FW\n");
goto if_remove;
/* ignore the error to allow debugging */
}
}
@ -557,8 +557,6 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
if_remove:
wil_if_remove(wil);
bus_disable:
wil_if_pcie_disable(wil);
err_iounmap:

4
drivers/net/wireless/ath/wil6210/txrx_edma.c
View file

@ -1011,8 +1011,8 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil,
}
stats = &wil->sta[cid].stats;
if (unlikely(skb->len < ETH_HLEN)) {
wil_dbg_txrx(wil, "Short frame, len = %d\n", skb->len);
if (unlikely(dmalen < ETH_HLEN)) {
wil_dbg_txrx(wil, "Short frame, len = %d\n", dmalen);
stats->rx_short_frame++;
rxdata->skipping = true;
goto skipping;