Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
wireless
/
realtek
/
rtlwifi
/
pci.c
diff --git
a/kernel/drivers/net/wireless/realtek/rtlwifi/pci.c
b/kernel/drivers/net/wireless/realtek/rtlwifi/pci.c
index
7f471bf
..
a522303
100644
(file)
--- a/
kernel/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/
kernel/drivers/net/wireless/realtek/rtlwifi/pci.c
@@
-664,11
+664,9
@@
tx_status_ok:
}
if (((rtlpriv->link_info.num_rx_inperiod +
}
if (((rtlpriv->link_info.num_rx_inperiod +
- rtlpriv->link_info.num_tx_inperiod) > 8) ||
- (rtlpriv->link_info.num_rx_inperiod > 2)) {
- rtlpriv->enter_ps = false;
- schedule_work(&rtlpriv->works.lps_change_work);
- }
+ rtlpriv->link_info.num_tx_inperiod) > 8) ||
+ (rtlpriv->link_info.num_rx_inperiod > 2))
+ rtl_lps_leave(hw);
}
static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,
}
static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,
@@
-919,10
+917,8
@@
new_trx_end:
}
if (((rtlpriv->link_info.num_rx_inperiod +
rtlpriv->link_info.num_tx_inperiod) > 8) ||
}
if (((rtlpriv->link_info.num_rx_inperiod +
rtlpriv->link_info.num_tx_inperiod) > 8) ||
- (rtlpriv->link_info.num_rx_inperiod > 2)) {
- rtlpriv->enter_ps = false;
- schedule_work(&rtlpriv->works.lps_change_work);
- }
+ (rtlpriv->link_info.num_rx_inperiod > 2))
+ rtl_lps_leave(hw);
skb = new_skb;
no_new:
if (rtlpriv->use_new_trx_flow) {
skb = new_skb;
no_new:
if (rtlpriv->use_new_trx_flow) {
@@
-1573,7
+1569,7
@@
int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
true,
HW_DESC_TXBUFF_ADDR),
skb->len, PCI_DMA_TODEVICE);
true,
HW_DESC_TXBUFF_ADDR),
skb->len, PCI_DMA_TODEVICE);
-
kfree_skb
(skb);
+
dev_kfree_skb_irq
(skb);
ring->idx = (ring->idx + 1) % ring->entries;
}
ring->idx = 0;
ring->idx = (ring->idx + 1) % ring->entries;
}
ring->idx = 0;