Skip to content

W
wr-switch-sw
Commit dc68faa0 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

Merge branch 'rubi-fix_send' 

Fix problem with hanging send in PPSI
parents 425fe06d 8c3baabe
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
kernel/wr_nic/nic-core.c
View file @ dc68faa0
......@@ -188,7 +188,7 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
desc = __wrn_alloc_tx_desc(wrn);
id = (wrn->id++) & 0xffff;
if (id == 0) /* 0 cannot be used in the SPEC; irrelevant in WRS */
id = wrn->id++;
id = (wrn->id++) & 0xffff;
spin_unlock_irqrestore(&wrn->lock, flags);
if (desc < 0) /* error */
......@@ -200,8 +200,9 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
//spin_lock_irqsave(&ep->lock, flags);
if (wrn->skb_desc[desc].skb) {
pr_err("%s: descriptor overflow: tx timestamp pending\n",
pr_warn("%s: discarding tx frame that got no timestamp\n",
__func__);
dev_kfree_skb_irq(wrn->skb_desc[desc].skb);
}
wrn->skb_desc[desc].skb = skb; /* Save for tx irq and stamping */
wrn->skb_desc[desc].frame_id = id; /* Save for tx irq and stamping */
......
ppsi @ b9f3fde4
Subproject commit ed2122f4b55dc3eaed1f5c446c71ae0d4d89afe4
Subproject commit b9f3fde488e31464343af53ca74f99f57e2ba4f9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment