aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Keller <[email protected]>2015-06-03 16:31:00 -0700
committerJeff Kirsher <[email protected]>2015-06-17 14:20:33 -0700
commite075996ebd14dcd3d1a45172316141fe26d891fa (patch)
tree3942d052581f7e78007604c813193c6c6155f3d2
parent608bb146ff48588c43bf6332912ea8796768fb39 (diff)
fm10k: move setting shinfo inside ts_tx_enqueue
This patch simplifies the code flow for setting the IN_PROGRESS bit of the shinfo for an skb we will be timestamping. Reported-by: Eric Dumazet <[email protected]> Signed-off-by: Jacob Keller <[email protected]> Tested-by: Krishneil Singh <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_ptp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
index 95f1d62b0690..39b832889b75 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
@@ -70,16 +70,16 @@ void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb)
* if none are present then insert skb in tail of list
*/
skb = fm10k_ts_tx_skb(interface, FM10K_CB(clone)->fi.w.dglort);
- if (!skb)
+ if (!skb) {
+ skb_shinfo(clone)->tx_flags |= SKBTX_IN_PROGRESS;
__skb_queue_tail(list, clone);
+ }
spin_unlock_irqrestore(&list->lock, flags);
/* if list is already has one then we just free the clone */
if (skb)
kfree_skb(skb);
- else
- skb_shinfo(clone)->tx_flags |= SKBTX_IN_PROGRESS;
}
void fm10k_ts_tx_hwtstamp(struct fm10k_intfc *interface, __le16 dglort,