From de96ac3bf074aaca0b7ae28bd425223fd746a38f Mon Sep 17 00:00:00 2001 From: Jake Day Date: Thu, 1 Mar 2018 18:32:27 -0500 Subject: [PATCH] update wifi patches --- patches-4.14/wifi.patch | 9 --------- patches-4.15/wifi.patch | 9 --------- 2 files changed, 18 deletions(-) diff --git a/patches-4.14/wifi.patch b/patches-4.14/wifi.patch index dfaca0e7a..3c2425530 100644 --- a/patches-4.14/wifi.patch +++ b/patches-4.14/wifi.patch @@ -173,15 +173,6 @@ index cd31494..575da92 100644 skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len); skb_trim(skb, rx_len); -@@ -2781,7 +2791,7 @@ static void mwifiex_pcie_card_reset_work(struct mwifiex_adapter *adapter) - { - struct pcie_service_card *card = adapter->card; - -- pci_reset_function(card->dev); -+ pci_try_reset_function(card->dev); - } - - static void mwifiex_pcie_work(struct work_struct *work) diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c index fb09014..5b8329e 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c diff --git a/patches-4.15/wifi.patch b/patches-4.15/wifi.patch index dfaca0e7a..3c2425530 100644 --- a/patches-4.15/wifi.patch +++ b/patches-4.15/wifi.patch @@ -173,15 +173,6 @@ index cd31494..575da92 100644 skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len); skb_trim(skb, rx_len); -@@ -2781,7 +2791,7 @@ static void mwifiex_pcie_card_reset_work(struct mwifiex_adapter *adapter) - { - struct pcie_service_card *card = adapter->card; - -- pci_reset_function(card->dev); -+ pci_try_reset_function(card->dev); - } - - static void mwifiex_pcie_work(struct work_struct *work) diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c index fb09014..5b8329e 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c