update wifi patches
This commit is contained in:
parent
0c676b782e
commit
de96ac3bf0
|
@ -173,15 +173,6 @@ index cd31494..575da92 100644
|
||||||
skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
|
skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
|
||||||
skb_trim(skb, rx_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
|
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||||
index fb09014..5b8329e 100644
|
index fb09014..5b8329e 100644
|
||||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||||
|
|
|
@ -173,15 +173,6 @@ index cd31494..575da92 100644
|
||||||
skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
|
skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
|
||||||
skb_trim(skb, rx_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
|
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||||
index fb09014..5b8329e 100644
|
index fb09014..5b8329e 100644
|
||||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||||
|
|
Loading…
Reference in a new issue