Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75859120 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 3c252aaa 1666d0d9

drivers/net/wireless/ath/wil6210/pcie_bus.c

+1 −3
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/ath/wil6210/txrx_edma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;