mirror of
https://github.com/suyu-emu/horinux.git
synced 2026-09-21 14:15:21 -07:00
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== 40GbE Intel Wired LAN Driver Updates 2018-05-22 This series contains updates to i40e only. Jake provides all the changes in this series starting with making it consistent in how we approach the bit lock. Fixed the reporting of the VEB statistics and the queue statistics to always return every queue even if it is not currently in use. Use WARN_ONCE() so that the first time we end up with an incorrect size we will dump a stack trace and a message to help highlight the issue early in testing. Folded the fixed string prefix into the stat string definition. Instead of using a separate char *p pointer when copying strings, use the data pointer directly. Added code comments for several of the statistic functions to better explain the number and ordering of statistics. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -799,9 +799,11 @@ void i40e_ptp_stop(struct i40e_pf *pf)
|
||||
pf->ptp_rx = false;
|
||||
|
||||
if (pf->ptp_tx_skb) {
|
||||
dev_kfree_skb_any(pf->ptp_tx_skb);
|
||||
struct sk_buff *skb = pf->ptp_tx_skb;
|
||||
|
||||
pf->ptp_tx_skb = NULL;
|
||||
clear_bit_unlock(__I40E_PTP_TX_IN_PROGRESS, pf->state);
|
||||
dev_kfree_skb_any(skb);
|
||||
}
|
||||
|
||||
if (pf->ptp_clock) {
|
||||
|
||||
Reference in New Issue
Block a user